diff --git a/hassio/addons/addon.py b/hassio/addons/addon.py
index 659de8fc6..82f1e8ef3 100644
--- a/hassio/addons/addon.py
+++ b/hassio/addons/addon.py
@@ -48,9 +48,9 @@ from ..const import (
     ATTR_INGRESS_PORT,
     ATTR_INGRESS_TOKEN,
     ATTR_INGRESS_PANEL,
-    ATTR_INGRESS_PANEL_ADMIN,
-    ATTR_INGRESS_PANEL_ICON,
-    ATTR_INGRESS_PANEL_TITLE,
+    ATTR_PANEL_ADMIN,
+    ATTR_PANEL_ICON,
+    ATTR_PANEL_TITLE,
     ATTR_KERNEL_MODULES,
     ATTR_LEGACY,
     ATTR_LOCATON,
@@ -454,19 +454,19 @@ class Addon(CoreSysAttributes):
         return port
 
     @property
-    def ingress_icon(self) -> str:
+    def panel_icon(self) -> str:
         """Return panel icon for Ingress frame."""
-        return self._mesh[ATTR_INGRESS_PANEL_ICON]
+        return self._mesh[ATTR_PANEL_ICON]
 
     @property
-    def ingress_title(self) -> str:
+    def panel_title(self) -> str:
         """Return panel icon for Ingress frame."""
-        return self._mesh.get(ATTR_INGRESS_PANEL_TITLE, self.name)
+        return self._mesh.get(ATTR_PANEL_TITLE, self.name)
 
     @property
-    def ingress_admin(self) -> str:
+    def panel_admin(self) -> str:
         """Return panel icon for Ingress frame."""
-        return self._mesh[ATTR_INGRESS_PANEL_ADMIN]
+        return self._mesh[ATTR_PANEL_ADMIN]
 
     @property
     def host_network(self):
diff --git a/hassio/addons/validate.py b/hassio/addons/validate.py
index a618961a8..ac2c2efe6 100644
--- a/hassio/addons/validate.py
+++ b/hassio/addons/validate.py
@@ -42,9 +42,9 @@ from ..const import (
     ATTR_INGRESS_PORT,
     ATTR_INGRESS_TOKEN,
     ATTR_INGRESS_PANEL,
-    ATTR_INGRESS_PANEL_ADMIN,
-    ATTR_INGRESS_PANEL_ICON,
-    ATTR_INGRESS_PANEL_TITLE,
+    ATTR_PANEL_ADMIN,
+    ATTR_PANEL_ICON,
+    ATTR_PANEL_TITLE,
     ATTR_KERNEL_MODULES,
     ATTR_LEGACY,
     ATTR_LOCATON,
@@ -163,9 +163,9 @@ SCHEMA_ADDON_CONFIG = vol.Schema({
     vol.Optional(ATTR_INGRESS, default=False): vol.Boolean(),
     vol.Optional(ATTR_INGRESS_PORT, default=8099): vol.Any(NETWORK_PORT, vol.Equal(0)),
     vol.Optional(ATTR_INGRESS_ENTRY): vol.Coerce(str),
-    vol.Optional(ATTR_INGRESS_PANEL_ICON, default="mdi:puzzle"): vol.Coerce(str),
-    vol.Optional(ATTR_INGRESS_PANEL_TITLE): vol.Coerce(str),
-    vol.Optional(ATTR_INGRESS_PANEL_ADMIN, default=True): vol.Boolean(),
+    vol.Optional(ATTR_PANEL_ICON, default="mdi:puzzle"): vol.Coerce(str),
+    vol.Optional(ATTR_PANEL_TITLE): vol.Coerce(str),
+    vol.Optional(ATTR_PANEL_ADMIN, default=True): vol.Boolean(),
     vol.Optional(ATTR_HOMEASSISTANT): vol.Maybe(vol.Coerce(str)),
     vol.Optional(ATTR_HOST_NETWORK, default=False): vol.Boolean(),
     vol.Optional(ATTR_HOST_PID, default=False): vol.Boolean(),
diff --git a/hassio/api/ingress.py b/hassio/api/ingress.py
index ac9ae289a..ef249483d 100644
--- a/hassio/api/ingress.py
+++ b/hassio/api/ingress.py
@@ -61,9 +61,9 @@ class APIIngress(CoreSysAttributes):
         addons = {}
         for addon in self.sys_ingress.addons:
             addons[addon.slug] = {
-                ATTR_TITLE: addon.ingress_title,
-                ATTR_ICON: addon.ingress_icon,
-                ATTR_ADMIN: addon.ingress_admin,
+                ATTR_TITLE: addon.panel_title,
+                ATTR_ICON: addon.panel_icon,
+                ATTR_ADMIN: addon.panel_admin,
                 ATTR_ENABLE: addon.ingress_panel,
             }
 
diff --git a/hassio/const.py b/hassio/const.py
index b322d99f4..76ee33cc6 100644
--- a/hassio/const.py
+++ b/hassio/const.py
@@ -199,9 +199,9 @@ ATTR_INGRESS_ENTRY = "ingress_entry"
 ATTR_INGRESS_TOKEN = "ingress_token"
 ATTR_INGRESS_URL = "ingress_url"
 ATTR_INGRESS_PANEL = "ingress_panel"
-ATTR_INGRESS_PANEL_ICON = "ingress_panel_icon"
-ATTR_INGRESS_PANEL_TITLE = "ingress_panel_title"
-ATTR_INGRESS_PANEL_ADMIN = "ingress_panel_admin"
+ATTR_PANEL_ICON = "panel_icon"
+ATTR_PANEL_TITLE = "panel_title"
+ATTR_PANEL_ADMIN = "panel_admin"
 ATTR_TITLE = "title"
 ATTR_ENABLE = "enable"
 ATTR_IP_ADDRESS = "ip_address"