diff --git a/configs/sama5d3x-ek/ov2640/defconfig b/configs/sama5d3x-ek/ov2640/defconfig
index 80826e2df2..fb48b51a3f 100644
--- a/configs/sama5d3x-ek/ov2640/defconfig
+++ b/configs/sama5d3x-ek/ov2640/defconfig
@@ -58,6 +58,6 @@ CONFIG_START_YEAR=2013
 CONFIG_SYMTAB_ORDEREDBYNAME=y
 CONFIG_USART1_SERIAL_CONSOLE=y
 CONFIG_USER_ENTRYPOINT="ov2640_main"
-CONFIG_VIDEO_DEVICES=y
+CONFIG_DRIVERS_VIDEO=y
 CONFIG_VIDEO_OV2640=y
 CONFIG_WDOG_INTRESERVE=0
diff --git a/configs/sama5d4-ek/knsh/defconfig.ROMFS b/configs/sama5d4-ek/knsh/defconfig.ROMFS
index 191c970fff..d1cbdee184 100644
--- a/configs/sama5d4-ek/knsh/defconfig.ROMFS
+++ b/configs/sama5d4-ek/knsh/defconfig.ROMFS
@@ -471,7 +471,7 @@ CONFIG_RTC_DATETIME=y
 # CONFIG_TIMER is not set
 # CONFIG_ANALOG is not set
 # CONFIG_AUDIO_DEVICES is not set
-# CONFIG_VIDEO_DEVICES is not set
+# CONFIG_DRIVERS_VIDEO is not set
 # CONFIG_BCH is not set
 # CONFIG_INPUT is not set
 # CONFIG_LCD is not set
diff --git a/configs/sim/fb/defconfig b/configs/sim/fb/defconfig
index 9ec20e16a4..19a5016415 100644
--- a/configs/sim/fb/defconfig
+++ b/configs/sim/fb/defconfig
@@ -26,5 +26,5 @@ CONFIG_START_MONTH=11
 CONFIG_START_YEAR=2008
 CONFIG_USER_ENTRYPOINT="fb_main"
 CONFIG_USERMAIN_STACKSIZE=4096
-CONFIG_VIDEO_DEVICES=y
+CONFIG_DRIVERS_VIDEO=y
 CONFIG_VIDEO_FB=y
diff --git a/drivers/Kconfig b/drivers/Kconfig
index 937a5e13fe..5cff7fe782 100644
--- a/drivers/Kconfig
+++ b/drivers/Kconfig
@@ -270,15 +270,15 @@ if AUDIO_DEVICES
 source drivers/audio/Kconfig
 endif # AUDIO_DEVICES
 
-menuconfig VIDEO_DEVICES
+menuconfig DRIVERS_VIDEO
 	bool "Video Device Support"
 	default n
 	---help---
 		Enable support for video device drivers.
 
-if VIDEO_DEVICES
+if DRIVERS_VIDEO
 source drivers/video/Kconfig
-endif # VIDEO_DEVICES
+endif # DRIVERS_VIDEO
 
 menuconfig BCH
 	bool "Block-to-Character (BCH) Support"
diff --git a/drivers/video/Make.defs b/drivers/video/Make.defs
index 9a9e4dd5f5..4c673cdaf0 100644
--- a/drivers/video/Make.defs
+++ b/drivers/video/Make.defs
@@ -35,7 +35,7 @@
 
 # Include video drivers
 
-ifeq ($(CONFIG_VIDEO_DEVICES),y)
+ifeq ($(CONFIG_DRIVERS_VIDEO),y)
 
 ifeq ($(CONFIG_VIDEO_FB),y)
   CSRCS += fb.c