diff --git a/CODEOWNERS b/CODEOWNERS
index f872400c857..9562817b27f 100644
--- a/CODEOWNERS
+++ b/CODEOWNERS
@@ -99,7 +99,7 @@ homeassistant/components/configurator/* @home-assistant/core
 homeassistant/components/control4/* @lawtancool
 homeassistant/components/conversation/* @home-assistant/core
 homeassistant/components/coolmaster/* @OnFreund
-homeassistant/components/coronavirus/* @home_assistant/core
+homeassistant/components/coronavirus/* @home-assistant/core
 homeassistant/components/counter/* @fabaff
 homeassistant/components/cover/* @home-assistant/core
 homeassistant/components/cpuspeed/* @fabaff
@@ -141,7 +141,7 @@ homeassistant/components/emby/* @mezz64
 homeassistant/components/emoncms/* @borpin
 homeassistant/components/emonitor/* @bdraco
 homeassistant/components/emulated_kasa/* @kbickar
-homeassistant/components/energy/* @home_assistant/core
+homeassistant/components/energy/* @home-assistant/core
 homeassistant/components/enigma2/* @fbradyirl
 homeassistant/components/enocean/* @bdurrer
 homeassistant/components/enphase_envoy/* @gtdiehl
diff --git a/homeassistant/components/coronavirus/manifest.json b/homeassistant/components/coronavirus/manifest.json
index 08a88d1b826..87410d8b572 100644
--- a/homeassistant/components/coronavirus/manifest.json
+++ b/homeassistant/components/coronavirus/manifest.json
@@ -4,6 +4,6 @@
   "config_flow": true,
   "documentation": "https://www.home-assistant.io/integrations/coronavirus",
   "requirements": ["coronavirus==1.1.1"],
-  "codeowners": ["@home_assistant/core"],
+  "codeowners": ["@home-assistant/core"],
   "iot_class": "cloud_polling"
 }
diff --git a/homeassistant/components/energy/manifest.json b/homeassistant/components/energy/manifest.json
index ee6fd784823..3a3cbeff4e7 100644
--- a/homeassistant/components/energy/manifest.json
+++ b/homeassistant/components/energy/manifest.json
@@ -2,7 +2,7 @@
   "domain": "energy",
   "name": "Energy",
   "documentation": "https://www.home-assistant.io/integrations/energy",
-  "codeowners": ["@home_assistant/core"],
+  "codeowners": ["@home-assistant/core"],
   "iot_class": "calculated",
   "dependencies": ["websocket_api", "history"],
   "quality_scale": "internal"