diff --git a/web-src/src/App.vue b/web-src/src/App.vue
index 33486be6..5f88b3a2 100644
--- a/web-src/src/App.vue
+++ b/web-src/src/App.vue
@@ -85,7 +85,7 @@ export default {
 
   methods: {
     connect: function () {
-      this.$store.dispatch('add_notification', { text: 'Connecting to forked-daapd', type: 'info', topic: 'connection', timeout: 2000 })
+      this.$store.dispatch('add_notification', { text: 'Connecting to OwnTone server', type: 'info', topic: 'connection', timeout: 2000 })
 
       webapi.config().then(({ data }) => {
         this.$store.commit(types.UPDATE_CONFIG, data)
@@ -95,7 +95,7 @@ export default {
         this.open_ws()
         this.$Progress.finish()
       }).catch(() => {
-        this.$store.dispatch('add_notification', { text: 'Failed to connect to forked-daapd', type: 'danger', topic: 'connection' })
+        this.$store.dispatch('add_notification', { text: 'Failed to connect to OwnTone server', type: 'danger', topic: 'connection' })
       })
     },
 
diff --git a/web-src/src/components/ModalDialogAddRss.vue b/web-src/src/components/ModalDialogAddRss.vue
index 61bae7d4..8cfa1f75 100644
--- a/web-src/src/components/ModalDialogAddRss.vue
+++ b/web-src/src/components/ModalDialogAddRss.vue
@@ -15,7 +15,7 @@
                       <i class="mdi mdi-rss"></i>
                     </span>
                   </p>
-                  <p class="help">Adding a podcast includes creating an RSS playlist, that will allow forked-daapd to manage the podcast subscription.
+                  <p class="help">Adding a podcast includes creating an RSS playlist, that will allow OwnTone to manage the podcast subscription.
                   </p>
                 </div>
               </form>
diff --git a/web-src/src/components/NavbarTop.vue b/web-src/src/components/NavbarTop.vue
index c531283e..1a1c87d8 100644
--- a/web-src/src/components/NavbarTop.vue
+++ b/web-src/src/components/NavbarTop.vue
@@ -42,7 +42,7 @@
             @click="on_click_outside_settings">
           <a class="navbar-link is-arrowless">
             <span class="icon is-hidden-touch"><i class="mdi mdi-24px mdi-menu"></i></span>
-            <span class="is-hidden-desktop has-text-weight-bold">forked-daapd</span>
+            <span class="is-hidden-desktop has-text-weight-bold">OwnTone</span>
           </a>
 
           <div class="navbar-dropdown is-right">
diff --git a/web-src/src/pages/PageAbout.vue b/web-src/src/pages/PageAbout.vue
index 54a11b03..3a1cd59b 100644
--- a/web-src/src/pages/PageAbout.vue
+++ b/web-src/src/pages/PageAbout.vue
@@ -4,7 +4,7 @@
       <div class="container">
         <div class="columns is-centered">
           <div class="column is-four-fifths has-text-centered-mobile">
-            <p class="heading"><b>forked-daapd</b> - version {{ config.version }}</p>
+            <p class="heading"><b>OwnTone</b> - version {{ config.version }}</p>
             <h1 class="title is-4">{{ config.library_name }}</h1>
           </div>
         </div>
@@ -95,7 +95,7 @@
           <div class="column is-four-fifths">
             <div class="content has-text-centered-mobile">
               <p class="is-size-7">Compiled with support for {{ config.buildoptions | join }}.</p>
-              <p class="is-size-7">Web interface built with <a href="http://bulma.io">Bulma</a>, <a href="https://materialdesignicons.com/">Material Design Icons</a>, <a href="https://vuejs.org/">Vue.js</a>, <a href="https://github.com/mzabriskie/axios">axios</a> and <a href="https://github.com/ejurgensen/forked-daapd/network/dependencies">more</a>.</p>
+              <p class="is-size-7">Web interface built with <a href="http://bulma.io">Bulma</a>, <a href="https://materialdesignicons.com/">Material Design Icons</a>, <a href="https://vuejs.org/">Vue.js</a>, <a href="https://github.com/mzabriskie/axios">axios</a> and <a href="https://github.com/ejurgensen/OwnTone/network/dependencies">more</a>.</p>
             </div>
           </div>
         </div>
diff --git a/web-src/src/pages/PageSearch.vue b/web-src/src/pages/PageSearch.vue
index 4fd33dfe..a4ae6848 100644
--- a/web-src/src/pages/PageSearch.vue
+++ b/web-src/src/pages/PageSearch.vue
@@ -13,7 +13,7 @@
                     <i class="mdi mdi-magnify"></i>
                   </span>
                 </p>
-                <p class="help has-text-centered">Tip: you can search by a smart playlist query language <a href="https://github.com/ejurgensen/forked-daapd/blob/master/README_SMARTPL.md" target="_blank">expression</a> if you prefix it
+                <p class="help has-text-centered">Tip: you can search by a smart playlist query language <a href="https://github.com/ejurgensen/OwnTone/blob/master/README_SMARTPL.md" target="_blank">expression</a> if you prefix it
                   with <code>query:</code>.
                 </p>
               </div>
diff --git a/web-src/src/pages/SettingsPageArtwork.vue b/web-src/src/pages/SettingsPageArtwork.vue
index 116a43af..2aae0c57 100644
--- a/web-src/src/pages/SettingsPageArtwork.vue
+++ b/web-src/src/pages/SettingsPageArtwork.vue
@@ -10,7 +10,7 @@
       <template slot="content">
         <div class="content">
           <p>
-            forked-daapd supports PNG and JPEG artwork which is either placed as separate image files in the library,
+            OwnTone supports PNG and JPEG artwork which is either placed as separate image files in the library,
             embedded in the media files or made available online by radio stations.
           </p>
           <p>In addition to that, you can enable fetching artwork from the following artwork providers:</p>
diff --git a/web-src/src/pages/SettingsPageOnlineServices.vue b/web-src/src/pages/SettingsPageOnlineServices.vue
index b253dfe5..edbb63cc 100644
--- a/web-src/src/pages/SettingsPageOnlineServices.vue
+++ b/web-src/src/pages/SettingsPageOnlineServices.vue
@@ -9,7 +9,7 @@
 
       <template slot="content">
         <div class="notification is-size-7" v-if="!spotify.libspotify_installed">
-          <p>forked-daapd was either built without support for Spotify or libspotify is not installed.</p>
+          <p>OwnTone was either built without support for Spotify or libspotify is not installed.</p>
         </div>
         <div v-if="spotify.libspotify_installed">
           <div class="notification is-size-7">
@@ -40,10 +40,10 @@
             </form>
             <p class="help is-danger">{{ libspotify.errors.error }}</p>
             <p class="help">
-              libspotify enables forked-daapd to play Spotify tracks.
+              libspotify enables OwnTone to play Spotify tracks.
             </p>
             <p class="help">
-              forked-daapd will not store your password, but will still be able to log you in automatically afterwards, because libspotify saves a login token.
+              OwnTone will not store your password, but will still be able to log you in automatically afterwards, because libspotify saves a login token.
             </p>
           </div>
 
@@ -55,7 +55,7 @@
               Access granted for <b><code>{{ spotify.webapi_user }}</code></b>
             </p>
             <p class="help is-danger" v-if="spotify_missing_scope.length > 0">
-              Please reauthorize Web API access to grant forked-daapd the following additional access rights:
+              Please reauthorize Web API access to grant OwnTone the following additional access rights:
               <b><code>{{ spotify_missing_scope | join }}</code></b>
             </p>
             <div class="field fd-has-margin-top ">
@@ -79,7 +79,7 @@
 
       <template slot="content">
         <div class="notification is-size-7" v-if="!lastfm.enabled">
-          <p>forked-daapd was built without support for Last.fm.</p>
+          <p>OwnTone was built without support for Last.fm.</p>
         </div>
         <div v-if="lastfm.enabled">
           <p class="content">
@@ -105,7 +105,7 @@
               </div>
               <p class="help is-danger">{{ lastfm_login.errors.error }}</p>
               <p class="help">
-                forked-daapd will not store your Last.fm username/password, only the session key. The session key does not expire.
+                OwnTone will not store your Last.fm username/password, only the session key. The session key does not expire.
               </p>
             </form>
           </div>