diff --git a/.coveragerc b/.coveragerc
index 857b6b90a22..cd8b6da4d71 100644
--- a/.coveragerc
+++ b/.coveragerc
@@ -451,7 +451,6 @@ omit =
     homeassistant/components/*/zigbee.py
 
     homeassistant/components/zoneminder/*
-    homeassistant/components/*/zoneminder.py
 
     homeassistant/components/tuya.py
     homeassistant/components/*/tuya.py
diff --git a/CODEOWNERS b/CODEOWNERS
index cfb83919b9c..ff5211bd776 100644
--- a/CODEOWNERS
+++ b/CODEOWNERS
@@ -268,8 +268,7 @@ homeassistant/components/*/xiaomi_aqara.py @danielhiversen @syssi
 homeassistant/components/*/xiaomi_miio.py @rytilahti @syssi
 
 # Z
-homeassistant/components/zoneminder/ @rohankapoorcom
-homeassistant/components/*/zoneminder.py @rohankapoorcom
+homeassistant/components/zoneminder/* @rohankapoorcom
 
 # Other code
 homeassistant/scripts/check_config.py @kellerza
diff --git a/homeassistant/components/camera/zoneminder.py b/homeassistant/components/zoneminder/camera.py
similarity index 100%
rename from homeassistant/components/camera/zoneminder.py
rename to homeassistant/components/zoneminder/camera.py
diff --git a/homeassistant/components/sensor/zoneminder.py b/homeassistant/components/zoneminder/sensor.py
similarity index 100%
rename from homeassistant/components/sensor/zoneminder.py
rename to homeassistant/components/zoneminder/sensor.py
diff --git a/homeassistant/components/switch/zoneminder.py b/homeassistant/components/zoneminder/switch.py
similarity index 100%
rename from homeassistant/components/switch/zoneminder.py
rename to homeassistant/components/zoneminder/switch.py