diff --git a/drivers/video/CMakeLists.txt b/drivers/video/CMakeLists.txt
index b93c5bb2f66c671..866788871f7750f 100644
--- a/drivers/video/CMakeLists.txt
+++ b/drivers/video/CMakeLists.txt
@@ -5,9 +5,9 @@ zephyr_library()
 zephyr_library_sources(video_common.c)
 
 zephyr_library_sources_ifdef(CONFIG_VIDEO_MCUX_CSI	video_mcux_csi.c)
+zephyr_library_sources_ifdef(CONFIG_VIDEO_MT9M114	video_sensor_mt9m114.c)
+zephyr_library_sources_ifdef(CONFIG_VIDEO_OV2640	video_sensor_ov2640.c)
+zephyr_library_sources_ifdef(CONFIG_VIDEO_OV5640	video_sensor_ov5640.c)
+zephyr_library_sources_ifdef(CONFIG_VIDEO_OV7725	video_sensor_ov7725.c)
 zephyr_library_sources_ifdef(CONFIG_VIDEO_SW_GENERATOR	video_sw_generator.c)
-zephyr_library_sources_ifdef(CONFIG_VIDEO_MT9M114	mt9m114.c)
-zephyr_library_sources_ifdef(CONFIG_VIDEO_OV7725	ov7725.c)
-zephyr_library_sources_ifdef(CONFIG_VIDEO_OV2640	ov2640.c)
 zephyr_library_sources_ifdef(CONFIG_VIDEO_STM32_DCMI	video_stm32_dcmi.c)
-zephyr_library_sources_ifdef(CONFIG_VIDEO_OV5640	ov5640.c)
diff --git a/drivers/video/Kconfig b/drivers/video/Kconfig
index 9f44944150fc9af..e4469044d49d090 100644
--- a/drivers/video/Kconfig
+++ b/drivers/video/Kconfig
@@ -32,17 +32,12 @@ config VIDEO_BUFFER_POOL_ALIGN
 	default 64
 
 source "drivers/video/Kconfig.mcux_csi"
-
+source "drivers/video/Kconfig.sensor_mt9m114"
+source "drivers/video/Kconfig.sensor_ov2640"
+source "drivers/video/Kconfig.sensor_ov5640"
+source "drivers/video/Kconfig.sensor_ov7725"
 source "drivers/video/Kconfig.sw_generator"
-
-source "drivers/video/Kconfig.mt9m114"
-
-source "drivers/video/Kconfig.ov7725"
-
-source "drivers/video/Kconfig.ov2640"
-
 source "drivers/video/Kconfig.stm32_dcmi"
 
-source "drivers/video/Kconfig.ov5640"
 
 endif # VIDEO
diff --git a/drivers/video/Kconfig.mt9m114 b/drivers/video/Kconfig.sensor_mt9m114
similarity index 100%
rename from drivers/video/Kconfig.mt9m114
rename to drivers/video/Kconfig.sensor_mt9m114
diff --git a/drivers/video/Kconfig.ov2640 b/drivers/video/Kconfig.sensor_ov2640
similarity index 100%
rename from drivers/video/Kconfig.ov2640
rename to drivers/video/Kconfig.sensor_ov2640
diff --git a/drivers/video/Kconfig.ov5640 b/drivers/video/Kconfig.sensor_ov5640
similarity index 100%
rename from drivers/video/Kconfig.ov5640
rename to drivers/video/Kconfig.sensor_ov5640
diff --git a/drivers/video/Kconfig.ov7725 b/drivers/video/Kconfig.sensor_ov7725
similarity index 100%
rename from drivers/video/Kconfig.ov7725
rename to drivers/video/Kconfig.sensor_ov7725
diff --git a/drivers/video/mt9m114.c b/drivers/video/video_sensor_mt9m114.c
similarity index 100%
rename from drivers/video/mt9m114.c
rename to drivers/video/video_sensor_mt9m114.c
diff --git a/drivers/video/ov2640.c b/drivers/video/video_sensor_ov2640.c
similarity index 100%
rename from drivers/video/ov2640.c
rename to drivers/video/video_sensor_ov2640.c
diff --git a/drivers/video/ov5640.c b/drivers/video/video_sensor_ov5640.c
similarity index 100%
rename from drivers/video/ov5640.c
rename to drivers/video/video_sensor_ov5640.c
diff --git a/drivers/video/ov7725.c b/drivers/video/video_sensor_ov7725.c
similarity index 100%
rename from drivers/video/ov7725.c
rename to drivers/video/video_sensor_ov7725.c