diff --git a/ui/component/livestreamLayout/view.jsx b/ui/component/livestreamLayout/view.jsx
index ad6721211..5c1de8097 100644
--- a/ui/component/livestreamLayout/view.jsx
+++ b/ui/component/livestreamLayout/view.jsx
@@ -1,5 +1,5 @@
 // @flow
-import { BITWAVE_EMBED_URL } from 'constants/livestream';
+import { LIVESTREAM_EMBED_URL } from 'constants/livestream';
 import React from 'react';
 import FileTitleSection from 'component/fileTitleSection';
 import LivestreamComments from 'component/livestreamComments';
@@ -29,7 +29,7 @@ export default function LivestreamLayout(props: Props) {
         <div className="file-render file-render--video livestream">
           <div className="file-viewer">
             <iframe
-              src={`${BITWAVE_EMBED_URL}/${channelClaimId}?skin=odysee&autoplay=1`}
+              src={`${LIVESTREAM_EMBED_URL}/${channelClaimId}?skin=odysee&autoplay=1`}
               scrolling="no"
               allowFullScreen
             />
diff --git a/ui/component/livestreamLink/view.jsx b/ui/component/livestreamLink/view.jsx
index a41510e39..999239b51 100644
--- a/ui/component/livestreamLink/view.jsx
+++ b/ui/component/livestreamLink/view.jsx
@@ -1,5 +1,5 @@
 // @flow
-import { BITWAVE_LIVE_API } from 'constants/livestream';
+import { LIVESTREAM_LIVE_API } from 'constants/livestream';
 import * as CS from 'constants/claim_search';
 import React from 'react';
 import Card from 'component/common/card';
@@ -39,8 +39,8 @@ export default function LivestreamLink(props: Props) {
 
   React.useEffect(() => {
     function fetchIsStreaming() {
-      // $FlowFixMe Bitwave's API can handle garbage
-      fetch(`${BITWAVE_LIVE_API}/${livestreamChannelId}`)
+      // $FlowFixMe livestream API can handle garbage
+      fetch(`${LIVESTREAM_LIVE_API}/${livestreamChannelId}`)
         .then((res) => res.json())
         .then((res) => {
           if (res && res.success && res.data && res.data.live) {
diff --git a/ui/component/livestreamList/view.jsx b/ui/component/livestreamList/view.jsx
index 8bf033466..332a9e654 100644
--- a/ui/component/livestreamList/view.jsx
+++ b/ui/component/livestreamList/view.jsx
@@ -1,6 +1,6 @@
 // @flow
 import * as ICONS from 'constants/icons';
-import { BITWAVE_LIVE_API } from 'constants/livestream';
+import { LIVESTREAM_LIVE_API } from 'constants/livestream';
 import React from 'react';
 import Icon from 'component/common/icon';
 import Spinner from 'component/spinner';
@@ -14,7 +14,7 @@ export default function LivestreamList() {
 
   React.useEffect(() => {
     function checkCurrentLivestreams() {
-      fetch(BITWAVE_LIVE_API)
+      fetch(LIVESTREAM_LIVE_API)
         .then((res) => res.json())
         .then((res) => {
           setLoading(false);
diff --git a/ui/component/publishForm/view.jsx b/ui/component/publishForm/view.jsx
index c0b0a39af..2089fb6ca 100644
--- a/ui/component/publishForm/view.jsx
+++ b/ui/component/publishForm/view.jsx
@@ -28,7 +28,7 @@ import * as PUBLISH_MODES from 'constants/publish_types';
 import { useHistory } from 'react-router';
 import Spinner from 'component/spinner';
 import { toHex } from 'util/hex';
-import { BITWAVE_REPLAY_API } from 'constants/livestream';
+import { LIVESTREAM_REPLAY_API } from 'constants/livestream';
 
 // @if TARGET='app'
 import fs from 'fs';
@@ -274,7 +274,7 @@ function PublishForm(props: Props) {
   // move this to lbryinc OR to a file under ui, and/or provide a standardized livestreaming config.
   function fetchLivestreams(channelId, signature, timestamp) {
     setCheckingLivestreams(true);
-    fetch(`${BITWAVE_REPLAY_API}/${channelId}?signature=${signature || ''}&signing_ts=${timestamp || ''}`) // claimChannelId
+    fetch(`${LIVESTREAM_REPLAY_API}/${channelId}?signature=${signature || ''}&signing_ts=${timestamp || ''}`) // claimChannelId
       .then((res) => res.json())
       .then((res) => {
         if (!res || !res.data) {
diff --git a/ui/constants/livestream.js b/ui/constants/livestream.js
index 0418a9734..dced95c79 100644
--- a/ui/constants/livestream.js
+++ b/ui/constants/livestream.js
@@ -1,3 +1,4 @@
-export const BITWAVE_EMBED_URL = 'https://player.live.odysee.com/odysee';
-export const BITWAVE_LIVE_API = 'https://api.live.odysee.com/v1/odysee/live';
-export const BITWAVE_REPLAY_API = 'https://api.live.odysee.com/v1/replays/odysee';
+export const LIVESTREAM_EMBED_URL = 'https://player.live.odysee.com/odysee';
+export const LIVESTREAM_LIVE_API = 'https://api.live.odysee.com/v1/odysee/live';
+export const LIVESTREAM_REPLAY_API = 'https://api.live.odysee.com/v1/replays/odysee';
+export const LIVESTREAM_RTMP_URL = 'rtmp://stream.odysee.com/live';
diff --git a/ui/effects/use-get-livestreams.js b/ui/effects/use-get-livestreams.js
index e151534e5..fb77c1395 100644
--- a/ui/effects/use-get-livestreams.js
+++ b/ui/effects/use-get-livestreams.js
@@ -1,6 +1,6 @@
 // @flow
 import React from 'react';
-import { BITWAVE_LIVE_API } from 'constants/livestream';
+import { LIVESTREAM_LIVE_API } from 'constants/livestream';
 
 /**
  * Gets latest livestream info list. Returns null (instead of a blank object)
@@ -16,7 +16,7 @@ export default function useGetLivestreams(minViewers: number = 0, refreshMs: num
 
   React.useEffect(() => {
     function checkCurrentLivestreams() {
-      fetch(BITWAVE_LIVE_API)
+      fetch(LIVESTREAM_LIVE_API)
         .then((res) => res.json())
         .then((res) => {
           setLoading(false);
diff --git a/ui/page/livestream/view.jsx b/ui/page/livestream/view.jsx
index b6845194a..a4c7cff33 100644
--- a/ui/page/livestream/view.jsx
+++ b/ui/page/livestream/view.jsx
@@ -1,5 +1,5 @@
 // @flow
-import { BITWAVE_LIVE_API } from 'constants/livestream';
+import { LIVESTREAM_LIVE_API } from 'constants/livestream';
 import React from 'react';
 import Page from 'component/page';
 import LivestreamLayout from 'component/livestreamLayout';
@@ -56,8 +56,9 @@ export default function LivestreamPage(props: Props) {
   React.useEffect(() => {
     let interval;
     function checkIsLive() {
-      // $FlowFixMe Bitwave's API can handle garbage
-      fetch(`${BITWAVE_LIVE_API}/${livestreamChannelId}`)
+      // TODO: duplicate code below
+      // $FlowFixMe livestream API can handle garbage
+      fetch(`${LIVESTREAM_LIVE_API}/${livestreamChannelId}`)
         .then((res) => res.json())
         .then((res) => {
           if (!res || !res.data) {
@@ -105,7 +106,7 @@ export default function LivestreamPage(props: Props) {
 
   React.useEffect(() => {
     // Set playing uri to null so the popout player doesnt start playing the dummy claim if a user navigates back
-    // This can be removed when we start using the app video player, not a bitwave iframe
+    // This can be removed when we start using the app video player, not a LIVESTREAM iframe
     doSetPlayingUri({ uri: null });
   }, [doSetPlayingUri]);
 
diff --git a/ui/page/livestreamSetup/view.jsx b/ui/page/livestreamSetup/view.jsx
index f96b428a0..ab3e06f4f 100644
--- a/ui/page/livestreamSetup/view.jsx
+++ b/ui/page/livestreamSetup/view.jsx
@@ -16,6 +16,7 @@ import CopyableText from 'component/copyableText';
 import Card from 'component/common/card';
 import ClaimList from 'component/claimList';
 import usePersistedState from 'effects/use-persisted-state';
+import { LIVESTREAM_RTMP_URL } from 'constants/livestream';
 
 type Props = {
   channels: Array<ChannelClaim>,
@@ -182,7 +183,7 @@ export default function LivestreamSetupPage(props: Props) {
                       primaryButton
                       name="stream-server"
                       label={__('Stream server')}
-                      copyable="rtmp://stream.odysee.com/live"
+                      copyable={LIVESTREAM_RTMP_URL}
                       snackMessage={__('Copied')}
                     />
                     <CopyableText