diff --git a/src/common/AddonDetailsModal/AddonDetailsModal.js b/src/common/AddonDetailsModal/AddonDetailsModal.js
index 3d03d7819..d30582926 100644
--- a/src/common/AddonDetailsModal/AddonDetailsModal.js
+++ b/src/common/AddonDetailsModal/AddonDetailsModal.js
@@ -12,7 +12,7 @@ const AddonDetailsModal = ({ transportUrl, onCloseRequest }) => {
     const { core } = useServices();
     const addonDetails = useAddonDetails(transportUrl);
     const modalButtons = React.useMemo(() => {
-        if (addonDetails.addon === null || addonDetails.addon.content.type !== 'Ready') {
+        if (addonDetails.remote_addon === null || addonDetails.remote_addon.content.type !== 'Ready') {
             return null;
         }
 
@@ -30,7 +30,7 @@ const AddonDetailsModal = ({ transportUrl, onCloseRequest }) => {
                 action: 'Ctx',
                 args: {
                     action: 'InstallAddon',
-                    args: addonDetails.addon.content.content
+                    args: addonDetails.remote_addon.content.content
                 }
             });
             if (typeof onCloseRequest === 'function') {
@@ -46,7 +46,7 @@ const AddonDetailsModal = ({ transportUrl, onCloseRequest }) => {
                 action: 'Ctx',
                 args: {
                     action: 'UninstallAddon',
-                    args: addonDetails.addon.content.content.transportUrl
+                    args: addonDetails.remote_addon.content.content.transportUrl
                 }
             });
             if (typeof onCloseRequest === 'function') {
@@ -65,7 +65,7 @@ const AddonDetailsModal = ({ transportUrl, onCloseRequest }) => {
                     onClick: cancelOnClick
                 }
             },
-            addonDetails.addon.content.content.installed ?
+            addonDetails.remote_addon.content.content.installed ?
                 {
                     className: styles['uninstall-button'],
                     label: 'Uninstall',
@@ -92,27 +92,27 @@ const AddonDetailsModal = ({ transportUrl, onCloseRequest }) => {
                         Loading addon manifest
                     </div>
                     :
-                    addonDetails.addon === null || addonDetails.addon.content.type === 'Loading' ?
+                    addonDetails.remote_addon === null || addonDetails.remote_addon.content.type === 'Loading' ?
                         <div className={styles['addon-details-message-container']}>
                             Loading addon manifest from {addonDetails.selected.transport_url}
                         </div>
                         :
-                        addonDetails.addon.content.type === 'Err' ?
+                        addonDetails.remote_addon.content.type === 'Err' ?
                             <div className={styles['addon-details-message-container']}>
                                 Failed to get addon manifest from {addonDetails.selected.transport_url}.
-                                {addonDetails.addon.content.content}
+                                {addonDetails.remote_addon.content.content}
                             </div>
                             :
                             <AddonDetails
                                 className={styles['addon-details-container']}
-                                id={addonDetails.addon.content.content.manifest.id}
-                                name={addonDetails.addon.content.content.manifest.name}
-                                version={addonDetails.addon.content.content.manifest.version}
-                                logo={addonDetails.addon.content.content.manifest.logo}
-                                description={addonDetails.addon.content.content.manifest.description}
-                                types={addonDetails.addon.content.content.manifest.types}
-                                transportUrl={addonDetails.addon.content.content.transportUrl}
-                                official={addonDetails.addon.content.content.flags.official}
+                                id={addonDetails.remote_addon.content.content.manifest.id}
+                                name={addonDetails.remote_addon.content.content.manifest.name}
+                                version={addonDetails.remote_addon.content.content.manifest.version}
+                                logo={addonDetails.remote_addon.content.content.manifest.logo}
+                                description={addonDetails.remote_addon.content.content.manifest.description}
+                                types={addonDetails.remote_addon.content.content.manifest.types}
+                                transportUrl={addonDetails.remote_addon.content.content.transportUrl}
+                                official={addonDetails.remote_addon.content.content.flags.official}
                             />
             }
         </ModalDialog>
diff --git a/src/common/AddonDetailsModal/useAddonDetails.js b/src/common/AddonDetailsModal/useAddonDetails.js
index 3f66d5f9f..213a8f97e 100644
--- a/src/common/AddonDetailsModal/useAddonDetails.js
+++ b/src/common/AddonDetailsModal/useAddonDetails.js
@@ -5,25 +5,25 @@ const useModelState = require('stremio/common/useModelState');
 
 const initAddonDetailsState = () => ({
     selected: null,
-    addon: null
+    remote_addon: null
 });
 
 const mapAddonDetailsStateWithCtx = (addonDetails, ctx) => {
     const selected = addonDetails.selected;
-    const addon = addonDetails.addon !== null && addonDetails.addon.content.type === 'Ready' ?
+    const remote_addon = addonDetails.remote_addon !== null && addonDetails.remote_addon.content.type === 'Ready' ?
         {
-            transport_url: addonDetails.addon.transport_url,
+            transport_url: addonDetails.remote_addon.transport_url,
             content: {
-                type: addonDetails.addon.content.type,
+                type: addonDetails.remote_addon.content.type,
                 content: {
-                    ...addonDetails.addon.content.content,
-                    installed: ctx.profile.addons.some(({ transportUrl }) => transportUrl === addonDetails.addon.transport_url),
+                    ...addonDetails.remote_addon.content.content,
+                    installed: ctx.profile.addons.some(({ transportUrl }) => transportUrl === addonDetails.remote_addon.transport_url),
                 }
             }
         }
         :
-        addonDetails.addon;
-    return { selected, addon };
+        addonDetails.remote_addon;
+    return { selected, remote_addon };
 };
 
 const useAddonDetails = (transportUrl) => {