diff --git a/src/routes/Board/Board.js b/src/routes/Board/Board.js
index 92ac88603..e81c4d011 100644
--- a/src/routes/Board/Board.js
+++ b/src/routes/Board/Board.js
@@ -14,11 +14,11 @@ const Board = () => {
         <MainNavBars className={styles['board-container']} route={'board'}>
             <div className={styles['board-content']}>
                 {
-                    continueWatchingPreview.lib_items.length > 0 ?
+                    continueWatchingPreview.library_items.length > 0 ?
                         <MetaRow
                             className={classnames(styles['board-row'], styles['continue-watching-row'])}
                             title={'Continue Watching'}
-                            items={continueWatchingPreview.lib_items}
+                            items={continueWatchingPreview.library_items}
                             itemComponent={LibItem}
                             deepLinks={continueWatchingPreview.deepLinks}
                         />
diff --git a/src/routes/Board/useContinueWatchingPreview.js b/src/routes/Board/useContinueWatchingPreview.js
index 5a47f60fa..28f4c05de 100644
--- a/src/routes/Board/useContinueWatchingPreview.js
+++ b/src/routes/Board/useContinueWatchingPreview.js
@@ -5,7 +5,7 @@ const { useServices } = require('stremio/services');
 const { deepLinking, useModelState } = require('stremio/common');
 
 const mapContinueWatchingPreviewState = (continue_watching_preview) => {
-    const lib_items = continue_watching_preview.lib_items.map((libItem) => ({
+    const library_items = continue_watching_preview.library_items.map((libItem) => ({
         id: libItem._id,
         type: libItem.type,
         name: libItem.name,
@@ -18,7 +18,7 @@ const mapContinueWatchingPreviewState = (continue_watching_preview) => {
         deepLinks: deepLinking.withLibItem({ libItem })
     }));
     const deepLinks = { discover: '#/continuewatching' };
-    return { lib_items, deepLinks };
+    return { library_items, deepLinks };
 };
 
 const useContinueWatchingPreview = () => {
diff --git a/src/routes/Library/Library.js b/src/routes/Library/Library.js
index a7a4a16d2..bdb3cd28e 100644
--- a/src/routes/Library/Library.js
+++ b/src/routes/Library/Library.js
@@ -62,7 +62,7 @@ const Library = ({ model, route, urlParams, queryParams }) => {
                                     <div className={styles['message-label']}>{route === 'continuewatching' ? 'Continue Watching' : 'Library'} not loaded!</div>
                                 </div>
                                 :
-                                library.lib_items.length === 0 ?
+                                library.library_items.length === 0 ?
                                     <div className={styles['message-container']}>
                                         <Image
                                             className={styles['image']}
@@ -73,7 +73,7 @@ const Library = ({ model, route, urlParams, queryParams }) => {
                                     </div>
                                     :
                                     <div className={styles['meta-items-container']}>
-                                        {library.lib_items.map((libItem, index) => (
+                                        {library.library_items.map((libItem, index) => (
                                             <LibItem {...libItem} key={index} />
                                         ))}
                                     </div>
diff --git a/src/routes/Library/useLibrary.js b/src/routes/Library/useLibrary.js
index b0d36a0be..db63f0de0 100644
--- a/src/routes/Library/useLibrary.js
+++ b/src/routes/Library/useLibrary.js
@@ -6,13 +6,13 @@ const { CONSTANTS, deepLinking, useModelState, comparatorWithPriorities } = requ
 const initLibraryState = () => ({
     selected: null,
     type_names: [],
-    lib_items: []
+    library_items: []
 });
 
 const mapLibraryState = (library) => {
     const selected = library.selected;
     const type_names = library.type_names.sort(comparatorWithPriorities(CONSTANTS.TYPE_PRIORITIES));
-    const lib_items = library.lib_items.map((libItem) => ({
+    const library_items = library.library_items.map((libItem) => ({
         id: libItem._id,
         type: libItem.type,
         name: libItem.name,
@@ -24,7 +24,7 @@ const mapLibraryState = (library) => {
             null,
         deepLinks: deepLinking.withLibItem({ libItem })
     }));
-    return { selected, type_names, lib_items };
+    return { selected, type_names, library_items };
 };
 
 const useLibrary = (libraryModel, urlParams, queryParams) => {
diff --git a/src/routes/Player/Player.js b/src/routes/Player/Player.js
index b2a7ec2d7..37ce1b45c 100644
--- a/src/routes/Player/Player.js
+++ b/src/routes/Player/Player.js
@@ -75,12 +75,12 @@ const Player = ({ urlParams }) => {
     }, []);
     const onEnded = React.useCallback(() => {
         core.transport.dispatch({ action: 'Unload' }, 'player');
-        if (player.lib_item !== null) {
+        if (player.library_item !== null) {
             core.transport.dispatch({
                 action: 'Ctx',
                 args: {
                     action: 'RewindLibraryItem',
-                    args: player.lib_item._id
+                    args: player.library_item._id
                 }
             });
         }
@@ -189,8 +189,8 @@ const Player = ({ urlParams }) => {
                 commandArgs: {
                     stream: player.selected.stream,
                     autoplay: true,
-                    time: player.lib_item !== null && player.selected.video_id !== null && player.lib_item.state.video_id === player.selected.video_id ?
-                        player.lib_item.state.timeOffset
+                    time: player.library_item !== null && player.selected.video_id !== null && player.library_item.state.video_id === player.selected.video_id ?
+                        player.library_item.state.timeOffset
                         :
                         0,
                     transcode: casting,
diff --git a/src/routes/Player/usePlayer.js b/src/routes/Player/usePlayer.js
index 63b8af790..893df2811 100644
--- a/src/routes/Player/usePlayer.js
+++ b/src/routes/Player/usePlayer.js
@@ -9,7 +9,7 @@ const initPlayerState = () => ({
     meta_resource: null,
     subtitles_resources: [],
     next_video: null,
-    lib_item: null
+    library_item: null
 });
 
 const mapPlayerStateWithCtx = (player, ctx) => {
@@ -74,8 +74,8 @@ const mapPlayerStateWithCtx = (player, ctx) => {
         return { request, addon, content };
     });
     const next_video = player.next_video;
-    const lib_item = player.lib_item;
-    return { selected, meta_resource, subtitles_resources, next_video, lib_item };
+    const library_item = player.library_item;
+    return { selected, meta_resource, subtitles_resources, next_video, library_item };
 };
 
 const usePlayer = (urlParams) => {