diff --git a/src/common/ServerNotification/ServerNotification.js b/src/common/ServerNotification/ServerNotification.js
deleted file mode 100644
index 3f21e4b38..000000000
--- a/src/common/ServerNotification/ServerNotification.js
+++ /dev/null
@@ -1,27 +0,0 @@
-// Copyright (C) 2017-2020 Smart code 203358507
-
-const React = require('react');
-const PropTypes = require('prop-types');
-const classnames = require('classnames');
-const Button = require('stremio/common/Button');
-const styles = require('./styles');
-
-const ServerNotification = ({ className }) => {
-    return (
-        <div className={classnames(className, styles['notification-container'])}>
-            <div className={styles['notification-statement']}>Streaming server must be available.</div>
-            <Button className={styles['notification-button']} title={'later'}>
-                <span className={styles['notification-label']}>Later</span>
-            </Button>
-            <Button className={styles['notification-button']} title={'dismiss'}>
-                <span className={styles['notification-label']}>Dismiss</span>
-            </Button>
-        </div>
-    );
-};
-
-ServerNotification.propTypes = {
-    className: PropTypes.string
-};
-
-module.exports = ServerNotification;
diff --git a/src/common/ServerNotification/index.js b/src/common/ServerNotification/index.js
deleted file mode 100644
index 12e3a667d..000000000
--- a/src/common/ServerNotification/index.js
+++ /dev/null
@@ -1,5 +0,0 @@
-// Copyright (C) 2017-2020 Smart code 203358507
-
-const ServerNotification = require('./ServerNotification');
-
-module.exports = ServerNotification;
diff --git a/src/common/ServerWarning/ServerWarning.js b/src/common/ServerWarning/ServerWarning.js
new file mode 100644
index 000000000..11a410a3e
--- /dev/null
+++ b/src/common/ServerWarning/ServerWarning.js
@@ -0,0 +1,27 @@
+// Copyright (C) 2017-2020 Smart code 203358507
+
+const React = require('react');
+const PropTypes = require('prop-types');
+const classnames = require('classnames');
+const Button = require('stremio/common/Button');
+const styles = require('./styles');
+
+const ServerWarning = ({ className }) => {
+    return (
+        <div className={classnames(className, styles['warning-container'])}>
+            <div className={styles['warning-statement']}>Streaming server must be available.</div>
+            <Button className={styles['warning-button']} title={'later'}>
+                <span className={styles['warning-label']}>Later</span>
+            </Button>
+            <Button className={styles['warning-button']} title={'dismiss'}>
+                <span className={styles['warning-label']}>Dismiss</span>
+            </Button>
+        </div>
+    );
+};
+
+ServerWarning.propTypes = {
+    className: PropTypes.string
+};
+
+module.exports = ServerWarning;
diff --git a/src/common/ServerWarning/index.js b/src/common/ServerWarning/index.js
new file mode 100644
index 000000000..bc238df0c
--- /dev/null
+++ b/src/common/ServerWarning/index.js
@@ -0,0 +1,5 @@
+// Copyright (C) 2017-2020 Smart code 203358507
+
+const ServerWarning = require('./ServerWarning');
+
+module.exports = ServerWarning;
diff --git a/src/common/ServerNotification/styles.less b/src/common/ServerWarning/styles.less
similarity index 84%
rename from src/common/ServerNotification/styles.less
rename to src/common/ServerWarning/styles.less
index a3c61b57a..c2c093fff 100644
--- a/src/common/ServerNotification/styles.less
+++ b/src/common/ServerWarning/styles.less
@@ -2,25 +2,25 @@
 
 @import (reference) '~@stremio/stremio-colors/less/stremio-colors.less';
 
-.notification-container {
+.warning-container {
     display: flex;
     flex-direction: row;
     padding: 0.5rem 1rem;
     background-color: @color-accent3;
 
-    .notification-statement {
+    .warning-statement {
         flex: 1;
         margin-right: 1rem;
         font-size: 1.2rem;
         color: @color-surface-light5-90;
     }
 
-    .notification-button {
+    .warning-button {
         &:not(:last-child) {
             margin-right: 1rem;
         }
 
-        .notification-label {
+        .warning-label {
             font-size: 1.2rem;
             color: @color-surface-light5-90;
         }
diff --git a/src/common/index.js b/src/common/index.js
index 03a94dafe..b559cc3c8 100644
--- a/src/common/index.js
+++ b/src/common/index.js
@@ -17,7 +17,7 @@ const PaginationInput = require('./PaginationInput');
 const PlayIconCircleCentered = require('./PlayIconCircleCentered');
 const Popup = require('./Popup');
 const SearchBar = require('./SearchBar');
-const ServerNotification = require('./ServerNotification');
+const ServerWarning = require('./ServerWarning');
 const SharePrompt = require('./SharePrompt');
 const Slider = require('./Slider');
 const TextInput = require('./TextInput');
@@ -57,7 +57,7 @@ module.exports = {
     PlayIconCircleCentered,
     Popup,
     SearchBar,
-    ServerNotification,
+    ServerWarning,
     SharePrompt,
     Slider,
     TextInput,
diff --git a/src/routes/Board/Board.js b/src/routes/Board/Board.js
index 8c8e7bc29..c7b1a43f3 100644
--- a/src/routes/Board/Board.js
+++ b/src/routes/Board/Board.js
@@ -2,7 +2,7 @@
 
 const React = require('react');
 const classnames = require('classnames');
-const { MainNavBars, MetaRow, LibItem, MetaItem, ServerNotification } = require('stremio/common');
+const { MainNavBars, MetaRow, LibItem, MetaItem, ServerWarning } = require('stremio/common');
 const useBoard = require('./useBoard');
 const useContinueWatchingPreview = require('./useContinueWatchingPreview');
 const styles = require('./styles');
@@ -65,7 +65,7 @@ const Board = () => {
                     })}
                 </div>
             </MainNavBars>
-            <ServerNotification className={styles['board-notification-container']} />
+            <ServerWarning className={styles['board-warning-container']} />
         </div>
     );
 };
diff --git a/src/routes/Board/styles.less b/src/routes/Board/styles.less
index 37fbddff6..ce7abe4f0 100644
--- a/src/routes/Board/styles.less
+++ b/src/routes/Board/styles.less
@@ -41,7 +41,7 @@
         }
     }
 
-    .board-notification-container {
+    .board-warning-container {
         flex: none;
         align-self: stretch;
     }