diff --git a/src/common/AddonDetailsModal/AddonDetailsModal.js b/src/common/AddonDetailsModal/AddonDetailsModal.js
index 727504b6c..c6cefc7cd 100644
--- a/src/common/AddonDetailsModal/AddonDetailsModal.js
+++ b/src/common/AddonDetailsModal/AddonDetailsModal.js
@@ -3,7 +3,7 @@
 const React = require('react');
 const PropTypes = require('prop-types');
 const ModalDialog = require('stremio/common/ModalDialog');
-const { withModelSuspender } = require('stremio/common/useModelState');
+const { withCoreSuspender } = require('stremio/common/useModelState');
 const { useServices } = require('stremio/services');
 const AddonDetailsWithRemoteAndLocalAddon = withRemoteAndLocalAddon(require('./AddonDetails'));
 const useAddonDetails = require('./useAddonDetails');
@@ -159,4 +159,4 @@ const AddonDetailsModalFallback = ({ onCloseRequest }) => (
 
 AddonDetailsModalFallback.propTypes = AddonDetailsModal.propTypes;
 
-module.exports = withModelSuspender(AddonDetailsModal, AddonDetailsModalFallback);
+module.exports = withCoreSuspender(AddonDetailsModal, AddonDetailsModalFallback);
diff --git a/src/common/NavBar/HorizontalNavBar/NavMenu/NavMenuContent.js b/src/common/NavBar/HorizontalNavBar/NavMenu/NavMenuContent.js
index bc680c4d9..5a8983b1f 100644
--- a/src/common/NavBar/HorizontalNavBar/NavMenu/NavMenuContent.js
+++ b/src/common/NavBar/HorizontalNavBar/NavMenu/NavMenuContent.js
@@ -8,7 +8,7 @@ const { useServices } = require('stremio/services');
 const Button = require('stremio/common/Button');
 const useFullscreen = require('stremio/common/useFullscreen');
 const useProfile = require('stremio/common/useProfile');
-const { withModelSuspender } = require('stremio/common/useModelState');
+const { withCoreSuspender } = require('stremio/common/useModelState');
 const styles = require('./styles');
 
 const NavMenuContent = ({ onClick }) => {
@@ -93,4 +93,4 @@ const NavMenuContentFallback = () => (
     <div className={styles['nav-menu-container']} />
 );
 
-module.exports = withModelSuspender(NavMenuContent, NavMenuContentFallback);
+module.exports = withCoreSuspender(NavMenuContent, NavMenuContentFallback);
diff --git a/src/common/StreamingServerWarning/StreamingServerWarning.js b/src/common/StreamingServerWarning/StreamingServerWarning.js
index 9c6d7277a..be87bad66 100644
--- a/src/common/StreamingServerWarning/StreamingServerWarning.js
+++ b/src/common/StreamingServerWarning/StreamingServerWarning.js
@@ -6,7 +6,7 @@ const PropTypes = require('prop-types');
 const classnames = require('classnames');
 const Button = require('stremio/common/Button');
 const useProfile = require('stremio/common/useProfile');
-const { withModelSuspender } = require('stremio/common/useModelState');
+const { withCoreSuspender } = require('stremio/common/useModelState');
 const styles = require('./styles');
 
 const StreamingServerWarning = ({ className }) => {
@@ -63,4 +63,4 @@ StreamingServerWarning.propTypes = {
     className: PropTypes.string
 };
 
-module.exports = withModelSuspender(StreamingServerWarning);
+module.exports = withCoreSuspender(StreamingServerWarning);
diff --git a/src/common/index.js b/src/common/index.js
index 02f8ac9ab..edb69b446 100644
--- a/src/common/index.js
+++ b/src/common/index.js
@@ -36,7 +36,7 @@ const useDeepEqualMemo = require('./useDeepEqualMemo');
 const useDeepEqualState = require('./useDeepEqualState');
 const useFullscreen = require('./useFullscreen');
 const useLiveRef = require('./useLiveRef');
-const { withModelSuspender, useModelState } = require('./useModelState');
+const { withCoreSuspender, useModelState } = require('./useModelState');
 const useOnScrollToBottom = require('./useOnScrollToBottom');
 const useProfile = require('./useProfile');
 const useStreamingServer = require('./useStreamingServer');
@@ -80,7 +80,7 @@ module.exports = {
     useDeepEqualState,
     useFullscreen,
     useLiveRef,
-    withModelSuspender,
+    withCoreSuspender,
     useModelState,
     useOnScrollToBottom,
     useProfile,
diff --git a/src/common/useModelState.js b/src/common/useModelState.js
index 5f03bf49a..97c8ee588 100644
--- a/src/common/useModelState.js
+++ b/src/common/useModelState.js
@@ -7,9 +7,9 @@ const intersection = require('lodash.intersection');
 const { useRouteFocused } = require('stremio-router');
 const { useServices } = require('stremio/services');
 
-const ModelSuspenderContext = React.createContext();
+const CoreSuspenderContext = React.createContext();
 
-ModelSuspenderContext.displayName = 'ModelSuspenderContext';
+CoreSuspenderContext.displayName = 'CoreSuspenderContext';
 
 function wrapPromise(promise) {
     let status = 'pending';
@@ -37,8 +37,8 @@ function wrapPromise(promise) {
     };
 }
 
-const withModelSuspender = (Component, Fallback = () => { }) => {
-    return function WithModelSuspender(props) {
+const withCoreSuspender = (Component, Fallback = () => { }) => {
+    return function withCoreSuspender(props) {
         const { core } = useServices();
         const initStateRef = React.useRef({});
         const getInitState = React.useCallback((model) => {
@@ -50,9 +50,9 @@ const withModelSuspender = (Component, Fallback = () => { }) => {
         }, []);
         return (
             <React.Suspense fallback={<Fallback {...props} />}>
-                <ModelSuspenderContext.Provider value={getInitState}>
+                <CoreSuspenderContext.Provider value={getInitState}>
                     <Component {...props} />
-                </ModelSuspenderContext.Provider>
+                </CoreSuspenderContext.Provider>
             </React.Suspense>
         );
     };
@@ -65,7 +65,7 @@ const useModelState = ({ action, ...args }) => {
     const [model, timeout, map, deps] = React.useMemo(() => {
         return [args.model, args.timeout, args.map, args.deps];
     }, []);
-    const getInitState = React.useContext(ModelSuspenderContext);
+    const getInitState = React.useContext(CoreSuspenderContext);
     const [state, setState] = React.useReducer(
         (prevState, nextState) => {
             return Object.keys(prevState).reduce((result, key) => {
@@ -124,6 +124,6 @@ const useModelState = ({ action, ...args }) => {
 };
 
 module.exports = {
-    withModelSuspender,
+    withCoreSuspender,
     useModelState
 };
diff --git a/src/routes/Library/Library.js b/src/routes/Library/Library.js
index 6bc72cd60..c2790824e 100644
--- a/src/routes/Library/Library.js
+++ b/src/routes/Library/Library.js
@@ -5,7 +5,7 @@ const PropTypes = require('prop-types');
 const classnames = require('classnames');
 const Icon = require('@stremio/stremio-icons/dom');
 const NotFound = require('stremio/routes/NotFound');
-const { Button, DelayedRenderer, Multiselect, MainNavBars, LibItem, Image, ModalDialog, PaginationInput, useProfile, routesRegexp, useBinaryState, withModelSuspender } = require('stremio/common');
+const { Button, DelayedRenderer, Multiselect, MainNavBars, LibItem, Image, ModalDialog, PaginationInput, useProfile, routesRegexp, useBinaryState, withCoreSuspender } = require('stremio/common');
 const useLibrary = require('./useLibrary');
 const useSelectableInputs = require('./useSelectableInputs');
 const styles = require('./styles');
@@ -140,4 +140,4 @@ const LibraryFallback = ({ model }) => (
 
 LibraryFallback.propTypes = Library.propTypes;
 
-module.exports = withModel(withModelSuspender(Library, LibraryFallback));
+module.exports = withModel(withCoreSuspender(Library, LibraryFallback));
diff --git a/src/routes/Settings/Settings.js b/src/routes/Settings/Settings.js
index 3386d877a..44550794e 100644
--- a/src/routes/Settings/Settings.js
+++ b/src/routes/Settings/Settings.js
@@ -6,7 +6,7 @@ const throttle = require('lodash.throttle');
 const Icon = require('@stremio/stremio-icons/dom');
 const { useRouteFocused } = require('stremio-router');
 const { useServices } = require('stremio/services');
-const { Button, Checkbox, MainNavBars, Multiselect, ColorInput, TextInput, ModalDialog, useProfile, useStreamingServer, useBinaryState, withModelSuspender } = require('stremio/common');
+const { Button, Checkbox, MainNavBars, Multiselect, ColorInput, TextInput, ModalDialog, useProfile, useStreamingServer, useBinaryState, withCoreSuspender } = require('stremio/common');
 const useProfileSettingsInputs = require('./useProfileSettingsInputs');
 const useStreamingServerSettingsInputs = require('./useStreamingServerSettingsInputs');
 const styles = require('./styles');
@@ -453,4 +453,4 @@ const SettingsFallback = () => (
     <MainNavBars className={styles['settings-container']} route={'settings'} />
 );
 
-module.exports = withModelSuspender(Settings, SettingsFallback);
+module.exports = withCoreSuspender(Settings, SettingsFallback);