diff --git a/CODEOWNERS b/CODEOWNERS
index 19f33b3f728..a54bbc7ecff 100644
--- a/CODEOWNERS
+++ b/CODEOWNERS
@@ -138,13 +138,13 @@
 /drivers/i2s/i2s_ll_stm32*                @avisconti
 /drivers/ieee802154/                      @jukkar @tbursztyka
 /drivers/interrupt_controller/            @andrewboie
+/drivers/*/intc_vexriscv_litex.c          @mateusz-holenko @kgugala @pgielda
 /drivers/ipm/ipm_mhu*                     @karl-zh
 /drivers/ipm/Kconfig.nrfx                 @masz-nordic @ioannisg
 /drivers/ipm/Kconfig.nrfx_ipc_channel     @masz-nordic @ioannisg
 /drivers/ipm/ipm_nrfx_ipc.c               @masz-nordic @ioannisg
 /drivers/ipm/ipm_nrfx_ipc.h               @masz-nordic @ioannisg
 /drivers/ipm/ipm_stm32_ipcc.c             @arnopo
-/drivers/*/vexriscv_litex.c               @mateusz-holenko @kgugala @pgielda
 /drivers/led/                             @Mani-Sadhasivam
 /drivers/led_strip/                       @mbolivar
 /drivers/modem/                           @mike-scott
diff --git a/drivers/gpio/gpio_sam0.c b/drivers/gpio/gpio_sam0.c
index 3a2f4090aee..025e5017279 100644
--- a/drivers/gpio/gpio_sam0.c
+++ b/drivers/gpio/gpio_sam0.c
@@ -8,7 +8,7 @@
 #include <device.h>
 #include <drivers/gpio.h>
 #include <soc.h>
-#include <interrupt_controller/sam0_eic.h>
+#include <interrupt_controller/intc_sam0_eic.h>
 
 #include "gpio_utils.h"
 
diff --git a/drivers/gpio/gpio_stm32.c b/drivers/gpio/gpio_stm32.c
index 24a65bda45a..c4c8bf8b77c 100644
--- a/drivers/gpio/gpio_stm32.c
+++ b/drivers/gpio/gpio_stm32.c
@@ -14,7 +14,7 @@
 #include <pinmux/stm32/pinmux_stm32.h>
 #include <drivers/pinmux.h>
 #include <sys/util.h>
-#include <interrupt_controller/exti_stm32.h>
+#include <interrupt_controller/intc_exti_stm32.h>
 
 #include "gpio_stm32.h"
 #include "gpio_utils.h"
diff --git a/drivers/interrupt_controller/CMakeLists.txt b/drivers/interrupt_controller/CMakeLists.txt
index 510b0c25945..eb6131c3197 100644
--- a/drivers/interrupt_controller/CMakeLists.txt
+++ b/drivers/interrupt_controller/CMakeLists.txt
@@ -1,16 +1,16 @@
 # SPDX-License-Identifier: Apache-2.0
 
-zephyr_sources_ifdef(CONFIG_ARCV2_INTERRUPT_UNIT    arcv2_irq_unit.c)
-zephyr_sources_ifdef(CONFIG_GIC                     gic-400.c)
-zephyr_sources_ifdef(CONFIG_IOAPIC                  ioapic_intr.c)
-zephyr_sources_ifdef(CONFIG_LOAPIC                  loapic_intr.c system_apic.c)
-zephyr_sources_ifdef(CONFIG_LOAPIC_SPURIOUS_VECTOR  loapic_spurious.S)
-zephyr_sources_ifdef(CONFIG_PLIC                    plic.c)
-zephyr_sources_ifdef(CONFIG_SHARED_IRQ              shared_irq.c)
-zephyr_sources_ifdef(CONFIG_EXTI_STM32              exti_stm32.c)
-zephyr_sources_ifdef(CONFIG_CAVS_ICTL               cavs_ictl.c)
-zephyr_sources_ifdef(CONFIG_DW_ICTL                 dw_ictl.c)
-zephyr_sources_ifdef(CONFIG_RV32M1_INTMUX           rv32m1_intmux.c)
-zephyr_sources_ifdef(CONFIG_SAM0_EIC                sam0_eic.c)
-zephyr_sources_ifdef(CONFIG_VEXRISCV_LITEX_IRQ      vexriscv_litex.c)
-zephyr_sources_ifdef(CONFIG_SWERV_PIC               swerv_pic.c)
+zephyr_sources_ifdef(CONFIG_ARCV2_INTERRUPT_UNIT    intc_arcv2_irq_unit.c)
+zephyr_sources_ifdef(CONFIG_GIC                     intc_gic_400.c)
+zephyr_sources_ifdef(CONFIG_IOAPIC                  intc_ioapic.c)
+zephyr_sources_ifdef(CONFIG_LOAPIC                  intc_loapic.c intc_system_apic.c)
+zephyr_sources_ifdef(CONFIG_LOAPIC_SPURIOUS_VECTOR  intc_loapic_spurious.S)
+zephyr_sources_ifdef(CONFIG_PLIC                    intc_plic.c)
+zephyr_sources_ifdef(CONFIG_SHARED_IRQ              intc_shared_irq.c)
+zephyr_sources_ifdef(CONFIG_EXTI_STM32              intc_exti_stm32.c)
+zephyr_sources_ifdef(CONFIG_CAVS_ICTL               intc_cavs.c)
+zephyr_sources_ifdef(CONFIG_DW_ICTL                 intc_dw.c)
+zephyr_sources_ifdef(CONFIG_RV32M1_INTMUX           intc_rv32m1_intmux.c)
+zephyr_sources_ifdef(CONFIG_SAM0_EIC                intc_sam0_eic.c)
+zephyr_sources_ifdef(CONFIG_VEXRISCV_LITEX_IRQ      intc_vexriscv_litex.c)
+zephyr_sources_ifdef(CONFIG_SWERV_PIC               intc_swerv_pic.c)
diff --git a/drivers/interrupt_controller/arcv2_irq_unit.c b/drivers/interrupt_controller/intc_arcv2_irq_unit.c
similarity index 100%
rename from drivers/interrupt_controller/arcv2_irq_unit.c
rename to drivers/interrupt_controller/intc_arcv2_irq_unit.c
diff --git a/drivers/interrupt_controller/cavs_ictl.c b/drivers/interrupt_controller/intc_cavs.c
similarity index 99%
rename from drivers/interrupt_controller/cavs_ictl.c
rename to drivers/interrupt_controller/intc_cavs.c
index 76c56ee312b..24ca20e00d1 100644
--- a/drivers/interrupt_controller/cavs_ictl.c
+++ b/drivers/interrupt_controller/intc_cavs.c
@@ -6,7 +6,7 @@
 
 #include <device.h>
 #include <irq_nextlevel.h>
-#include "cavs_ictl.h"
+#include "intc_cavs.h"
 
 static ALWAYS_INLINE void cavs_ictl_dispatch_child_isrs(u32_t intr_status,
 						       u32_t isr_base_offset)
diff --git a/drivers/interrupt_controller/cavs_ictl.h b/drivers/interrupt_controller/intc_cavs.h
similarity index 77%
rename from drivers/interrupt_controller/cavs_ictl.h
rename to drivers/interrupt_controller/intc_cavs.h
index d41b1f05a61..f6916de9b33 100644
--- a/drivers/interrupt_controller/cavs_ictl.h
+++ b/drivers/interrupt_controller/intc_cavs.h
@@ -4,8 +4,8 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#ifndef ZEPHYR_DRIVERS_INTERRUPT_CONTROLLER_CAVS_ICTL_H_
-#define ZEPHYR_DRIVERS_INTERRUPT_CONTROLLER_CAVS_ICTL_H_
+#ifndef ZEPHYR_DRIVERS_INTERRUPT_CONTROLLER_INTC_CAVS_H_
+#define ZEPHYR_DRIVERS_INTERRUPT_CONTROLLER_INTC_CAVS_H_
 
 #include <zephyr/types.h>
 
@@ -36,4 +36,4 @@ struct cavs_registers {
 }
 #endif
 
-#endif /* ZEPHYR_DRIVERS_INTERRUPT_CONTROLLER_CAVS_ICTL_H_ */
+#endif /* ZEPHYR_DRIVERS_INTERRUPT_CONTROLLER_INTC_CAVS_H_ */
diff --git a/drivers/interrupt_controller/dw_ictl.c b/drivers/interrupt_controller/intc_dw.c
similarity index 99%
rename from drivers/interrupt_controller/dw_ictl.c
rename to drivers/interrupt_controller/intc_dw.c
index faac1138883..2919e7af7c3 100644
--- a/drivers/interrupt_controller/dw_ictl.c
+++ b/drivers/interrupt_controller/intc_dw.c
@@ -13,7 +13,7 @@
 
 #include <device.h>
 #include <irq_nextlevel.h>
-#include "dw_ictl.h"
+#include "intc_dw.h"
 #include <soc.h>
 
 static ALWAYS_INLINE void dw_ictl_dispatch_child_isrs(u32_t intr_status,
diff --git a/drivers/interrupt_controller/dw_ictl.h b/drivers/interrupt_controller/intc_dw.h
similarity index 93%
rename from drivers/interrupt_controller/dw_ictl.h
rename to drivers/interrupt_controller/intc_dw.h
index 0155c08e49e..f5a5e320600 100644
--- a/drivers/interrupt_controller/dw_ictl.h
+++ b/drivers/interrupt_controller/intc_dw.h
@@ -4,8 +4,8 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#ifndef ZEPHYR_DRIVERS_INTERRUPT_CONTROLLER_DW_ICTL_H_
-#define ZEPHYR_DRIVERS_INTERRUPT_CONTROLLER_DW_ICTL_H_
+#ifndef ZEPHYR_DRIVERS_INTERRUPT_CONTROLLER_INTC_DW_H_
+#define ZEPHYR_DRIVERS_INTERRUPT_CONTROLLER_INTC_DW_H_
 
 #include <zephyr/types.h>
 
@@ -91,4 +91,4 @@ struct dw_ictl_registers {
 }
 #endif
 
-#endif /* ZEPHYR_DRIVERS_INTERRUPT_CONTROLLER_DW_ICTL_H_ */
+#endif /* ZEPHYR_DRIVERS_INTERRUPT_CONTROLLER_INTC_DW_H_ */
diff --git a/drivers/interrupt_controller/exti_stm32.c b/drivers/interrupt_controller/intc_exti_stm32.c
similarity index 99%
rename from drivers/interrupt_controller/exti_stm32.c
rename to drivers/interrupt_controller/intc_exti_stm32.c
index ab7a9050541..0b3a6f11067 100644
--- a/drivers/interrupt_controller/exti_stm32.c
+++ b/drivers/interrupt_controller/intc_exti_stm32.c
@@ -19,7 +19,7 @@
 #include <device.h>
 #include <soc.h>
 #include <sys/__assert.h>
-#include "exti_stm32.h"
+#include "intc_exti_stm32.h"
 
 #if defined(CONFIG_SOC_SERIES_STM32F0X) || \
     defined(CONFIG_SOC_SERIES_STM32L0X) || \
diff --git a/drivers/interrupt_controller/exti_stm32.h b/drivers/interrupt_controller/intc_exti_stm32.h
similarity index 89%
rename from drivers/interrupt_controller/exti_stm32.h
rename to drivers/interrupt_controller/intc_exti_stm32.h
index 012671f6508..9e347a79f52 100644
--- a/drivers/interrupt_controller/exti_stm32.h
+++ b/drivers/interrupt_controller/intc_exti_stm32.h
@@ -18,8 +18,8 @@
  *
  */
 
-#ifndef ZEPHYR_DRIVERS_INTERRUPT_CONTROLLER_EXTI_STM32_H_
-#define ZEPHYR_DRIVERS_INTERRUPT_CONTROLLER_EXTI_STM32_H_
+#ifndef ZEPHYR_DRIVERS_INTERRUPT_CONTROLLER_INTC_EXTI_STM32_H_
+#define ZEPHYR_DRIVERS_INTERRUPT_CONTROLLER_INTC_EXTI_STM32_H_
 
 #include <zephyr/types.h>
 
@@ -78,4 +78,4 @@ int stm32_exti_set_callback(int line, int port, stm32_exti_callback_t cb,
  */
 void stm32_exti_unset_callback(int line);
 
-#endif /* ZEPHYR_DRIVERS_INTERRUPT_CONTROLLER_EXTI_STM32_H_ */
+#endif /* ZEPHYR_DRIVERS_INTERRUPT_CONTROLLER_INTC_EXTI_STM32_H_ */
diff --git a/drivers/interrupt_controller/gic-400.c b/drivers/interrupt_controller/intc_gic_400.c
similarity index 100%
rename from drivers/interrupt_controller/gic-400.c
rename to drivers/interrupt_controller/intc_gic_400.c
diff --git a/drivers/interrupt_controller/ioapic_intr.c b/drivers/interrupt_controller/intc_ioapic.c
similarity index 99%
rename from drivers/interrupt_controller/ioapic_intr.c
rename to drivers/interrupt_controller/intc_ioapic.c
index d026b99a373..e059ee2a078 100644
--- a/drivers/interrupt_controller/ioapic_intr.c
+++ b/drivers/interrupt_controller/intc_ioapic.c
@@ -60,7 +60,7 @@
 
 #include <drivers/interrupt_controller/ioapic.h> /* public API declarations */
 #include <drivers/interrupt_controller/loapic.h> /* public API declarations and registers */
-#include "ioapic_priv.h"
+#include "intc_ioapic_priv.h"
 
 #define BITS_PER_IRQ  3
 #define IOAPIC_BITFIELD_HI_LO	0
diff --git a/drivers/interrupt_controller/ioapic_priv.h b/drivers/interrupt_controller/intc_ioapic_priv.h
similarity index 87%
rename from drivers/interrupt_controller/ioapic_priv.h
rename to drivers/interrupt_controller/intc_ioapic_priv.h
index 0b5456edb4e..ea56d9d3758 100644
--- a/drivers/interrupt_controller/ioapic_priv.h
+++ b/drivers/interrupt_controller/intc_ioapic_priv.h
@@ -7,8 +7,8 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#ifndef ZEPHYR_DRIVERS_INTERRUPT_CONTROLLER_IOAPIC_PRIV_H_
-#define ZEPHYR_DRIVERS_INTERRUPT_CONTROLLER_IOAPIC_PRIV_H_
+#ifndef ZEPHYR_DRIVERS_INTERRUPT_CONTROLLER_INTC_IOAPIC_PRIV_H_
+#define ZEPHYR_DRIVERS_INTERRUPT_CONTROLLER_INTC_IOAPIC_PRIV_H_
 
 /* IO APIC direct register offsets */
 
@@ -48,4 +48,4 @@
 
 #define IOAPIC_VEC_MASK 0x000000ff
 
-#endif
+#endif /* ZEPHYR_DRIVERS_INTERRUPT_CONTROLLER_INTC_IOAPIC_PRIV_H_ */
diff --git a/drivers/interrupt_controller/loapic_intr.c b/drivers/interrupt_controller/intc_loapic.c
similarity index 100%
rename from drivers/interrupt_controller/loapic_intr.c
rename to drivers/interrupt_controller/intc_loapic.c
diff --git a/drivers/interrupt_controller/loapic_spurious.S b/drivers/interrupt_controller/intc_loapic_spurious.S
similarity index 100%
rename from drivers/interrupt_controller/loapic_spurious.S
rename to drivers/interrupt_controller/intc_loapic_spurious.S
diff --git a/drivers/interrupt_controller/plic.c b/drivers/interrupt_controller/intc_plic.c
similarity index 100%
rename from drivers/interrupt_controller/plic.c
rename to drivers/interrupt_controller/intc_plic.c
diff --git a/drivers/interrupt_controller/rv32m1_intmux.c b/drivers/interrupt_controller/intc_rv32m1_intmux.c
similarity index 100%
rename from drivers/interrupt_controller/rv32m1_intmux.c
rename to drivers/interrupt_controller/intc_rv32m1_intmux.c
diff --git a/drivers/interrupt_controller/sam0_eic.c b/drivers/interrupt_controller/intc_sam0_eic.c
similarity index 99%
rename from drivers/interrupt_controller/sam0_eic.c
rename to drivers/interrupt_controller/intc_sam0_eic.c
index 232f5d6dce1..0dded7f44e9 100644
--- a/drivers/interrupt_controller/sam0_eic.c
+++ b/drivers/interrupt_controller/intc_sam0_eic.c
@@ -6,8 +6,8 @@
 
 #include <device.h>
 #include <soc.h>
-#include "sam0_eic.h"
-#include "sam0_eic_priv.h"
+#include "intc_sam0_eic.h"
+#include "intc_sam0_eic_priv.h"
 
 struct sam0_eic_line_assignment {
 	u8_t pin : 5;
diff --git a/drivers/interrupt_controller/sam0_eic.h b/drivers/interrupt_controller/intc_sam0_eic.h
similarity index 91%
rename from drivers/interrupt_controller/sam0_eic.h
rename to drivers/interrupt_controller/intc_sam0_eic.h
index f5b74f65800..0a4fa1a8dd2 100644
--- a/drivers/interrupt_controller/sam0_eic.h
+++ b/drivers/interrupt_controller/intc_sam0_eic.h
@@ -5,8 +5,8 @@
  */
 
 
-#ifndef ZEPHYR_DRIVERS_INTERRUPT_CONTROLLER_SAM0_EIC_H_
-#define ZEPHYR_DRIVERS_INTERRUPT_CONTROLLER_SAM0_EIC_H_
+#ifndef ZEPHYR_DRIVERS_INTERRUPT_CONTROLLER_INTC_SAM0_EIC_H_
+#define ZEPHYR_DRIVERS_INTERRUPT_CONTROLLER_INTC_SAM0_EIC_H_
 
 #include <zephyr/types.h>
 
@@ -81,4 +81,4 @@ int sam0_eic_disable_interrupt(int port, int pin);
  */
 u32_t sam0_eic_interrupt_pending(int por);
 
-#endif /* ZEPHYR_DRIVERS_INTERRUPT_CONTROLLER_SAM0_EIC_H_ */
+#endif /* ZEPHYR_DRIVERS_INTERRUPT_CONTROLLER_INTC_SAM0_EIC_H_ */
diff --git a/drivers/interrupt_controller/sam0_eic_priv.h b/drivers/interrupt_controller/intc_sam0_eic_priv.h
similarity index 98%
rename from drivers/interrupt_controller/sam0_eic_priv.h
rename to drivers/interrupt_controller/intc_sam0_eic_priv.h
index 3a7038f4c3d..514f61854aa 100644
--- a/drivers/interrupt_controller/sam0_eic_priv.h
+++ b/drivers/interrupt_controller/intc_sam0_eic_priv.h
@@ -4,8 +4,8 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#ifndef ZEPHYR_DRIVERS_INTERRUPT_CONTROLLER_SAM0_EIC_PRIV_H_
-#define ZEPHYR_DRIVERS_INTERRUPT_CONTROLLER_SAM0_EIC_PRIV_H_
+#ifndef ZEPHYR_DRIVERS_INTERRUPT_CONTROLLER_INTC_SAM0_EIC_PRIV_H_
+#define ZEPHYR_DRIVERS_INTERRUPT_CONTROLLER_INTC_SAM0_EIC_PRIV_H_
 
 #include <zephyr/types.h>
 #include <soc.h>
@@ -697,4 +697,4 @@ static inline int sam0_eic_map_to_line(int port, int pin)
 	return ch;
 }
 
-#endif /* ZEPHYR_DRIVERS_INTERRUPT_CONTROLLER_SAM0_EIC_PRIV_H_ */
+#endif /* ZEPHYR_DRIVERS_INTERRUPT_CONTROLLER_INTC_SAM0_EIC_PRIV_H_ */
diff --git a/drivers/interrupt_controller/shared_irq.c b/drivers/interrupt_controller/intc_shared_irq.c
similarity index 100%
rename from drivers/interrupt_controller/shared_irq.c
rename to drivers/interrupt_controller/intc_shared_irq.c
diff --git a/drivers/interrupt_controller/swerv_pic.c b/drivers/interrupt_controller/intc_swerv_pic.c
similarity index 100%
rename from drivers/interrupt_controller/swerv_pic.c
rename to drivers/interrupt_controller/intc_swerv_pic.c
diff --git a/drivers/interrupt_controller/system_apic.c b/drivers/interrupt_controller/intc_system_apic.c
similarity index 100%
rename from drivers/interrupt_controller/system_apic.c
rename to drivers/interrupt_controller/intc_system_apic.c
diff --git a/drivers/interrupt_controller/vexriscv_litex.c b/drivers/interrupt_controller/intc_vexriscv_litex.c
similarity index 100%
rename from drivers/interrupt_controller/vexriscv_litex.c
rename to drivers/interrupt_controller/intc_vexriscv_litex.c