diff --git a/tangerine.pro b/clementine.pro
similarity index 100%
rename from tangerine.pro
rename to clementine.pro
diff --git a/src/lastfmconfig.ui b/src/lastfmconfig.ui
index 7d62b1096..5d09e11f3 100644
--- a/src/lastfmconfig.ui
+++ b/src/lastfmconfig.ui
@@ -69,7 +69,7 @@
    <item>
     <widget class="QLabel" name="label_4">
      <property name="text">
-      <string>Note that you must be a &lt;b&gt;paid subscriber&lt;/b&gt; to listen to Last.fm radio from within Tangerine.</string>
+      <string>Note that you must be a &lt;span style=&quot; font-weight:600;&quot;&gt;paid subscriber&lt;/span&gt; to listen to Last.fm radio from within Clementine.</string>
      </property>
      <property name="wordWrap">
       <bool>true</bool>
diff --git a/src/librarybackend.cpp b/src/librarybackend.cpp
index f45a7a3df..897d2fe65 100644
--- a/src/librarybackend.cpp
+++ b/src/librarybackend.cpp
@@ -11,7 +11,7 @@
 #include <QCoreApplication>
 #include <QThread>
 
-const char* LibraryBackend::kDatabaseName = "tangerine.db";
+const char* LibraryBackend::kDatabaseName = "clementine.db";
 
 LibraryBackend::LibraryBackend(QObject* parent)
   : QObject(parent)
diff --git a/src/libraryview.cpp b/src/libraryview.cpp
index 936d1c739..3b2b705a2 100644
--- a/src/libraryview.cpp
+++ b/src/libraryview.cpp
@@ -91,7 +91,7 @@ void LibraryView::paintEvent(QPaintEvent* event) {
 
   QRect rect(viewport()->rect());
   if (total_song_count_ == 0) {
-    // Draw the confused tangerine
+    // Draw the confused clementine
     QRect image_rect((rect.width() - nomusic_.width()) / 2, 50,
                      nomusic_.width(), nomusic_.height());
     p.drawPixmap(image_rect, nomusic_);
diff --git a/src/main.cpp b/src/main.cpp
index 418c582c1..c58412449 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -5,9 +5,9 @@
 #include <QApplication>
 
 int main(int argc, char *argv[]) {
-  QCoreApplication::setApplicationName("Tangerine");
+  QCoreApplication::setApplicationName("Clementine");
   QCoreApplication::setApplicationVersion("0.1");
-  QCoreApplication::setOrganizationName("Tangerine");
+  QCoreApplication::setOrganizationName("Clementine");
   QCoreApplication::setOrganizationDomain("davidsansome.com");
 
   qRegisterMetaType<DirectoryList>("DirectoryList");
diff --git a/src/mainwindow.cpp b/src/mainwindow.cpp
index bbe48784c..8c5b50051 100644
--- a/src/mainwindow.cpp
+++ b/src/mainwindow.cpp
@@ -41,7 +41,7 @@ MainWindow::MainWindow(QWidget *parent)
 {
   ui_.setupUi(this);
   tray_icon_->setIcon(windowIcon());
-  tray_icon_->setToolTip("Tangerine");
+  tray_icon_->setToolTip(QCoreApplication::applicationName());
   tray_icon_->show();
 
   ui_.volume->setValue(player_->GetVolume());
diff --git a/src/mainwindow.ui b/src/mainwindow.ui
index cbca90e78..cf502590d 100644
--- a/src/mainwindow.ui
+++ b/src/mainwindow.ui
@@ -11,10 +11,10 @@
    </rect>
   </property>
   <property name="windowTitle">
-   <string>Tangerine</string>
+   <string>Clementine</string>
   </property>
   <property name="windowIcon">
-   <iconset resource="../data/data.qrc">
+   <iconset>
     <normaloff>:/icon.png</normaloff>:/icon.png</iconset>
   </property>
   <widget class="QWidget" name="centralWidget">
@@ -274,7 +274,7 @@
        <item>
         <widget class="QToolButton" name="library_filter_clear">
          <property name="icon">
-          <iconset resource="../data/data.qrc">
+          <iconset>
            <normaloff>:/clear.png</normaloff>:/clear.png</iconset>
          </property>
          <property name="iconSize">
@@ -294,7 +294,7 @@
        <item>
         <widget class="QToolButton" name="library_options">
          <property name="icon">
-          <iconset resource="../data/data.qrc">
+          <iconset>
            <normaloff>:/configure.png</normaloff>:/configure.png</iconset>
          </property>
          <property name="iconSize">
@@ -410,7 +410,7 @@
   </widget>
   <action name="action_previous_track">
    <property name="icon">
-    <iconset resource="../data/data.qrc">
+    <iconset>
      <normaloff>:/media-skip-backward.png</normaloff>:/media-skip-backward.png</iconset>
    </property>
    <property name="text">
@@ -419,7 +419,7 @@
   </action>
   <action name="action_play_pause">
    <property name="icon">
-    <iconset resource="../data/data.qrc">
+    <iconset>
      <normaloff>:/media-playback-start.png</normaloff>:/media-playback-start.png</iconset>
    </property>
    <property name="text">
@@ -431,7 +431,7 @@
     <bool>false</bool>
    </property>
    <property name="icon">
-    <iconset resource="../data/data.qrc">
+    <iconset>
      <normaloff>:/media-playback-stop.png</normaloff>:/media-playback-stop.png</iconset>
    </property>
    <property name="text">
@@ -440,7 +440,7 @@
   </action>
   <action name="action_next_track">
    <property name="icon">
-    <iconset resource="../data/data.qrc">
+    <iconset>
      <normaloff>:/media-skip-forward.png</normaloff>:/media-skip-forward.png</iconset>
    </property>
    <property name="text">
@@ -449,7 +449,7 @@
   </action>
   <action name="action_quit">
    <property name="icon">
-    <iconset resource="../data/data.qrc">
+    <iconset>
      <normaloff>:/exit.png</normaloff>:/exit.png</iconset>
    </property>
    <property name="text">
@@ -461,7 +461,7 @@
   </action>
   <action name="action_stop_after_this_track">
    <property name="icon">
-    <iconset resource="../data/data.qrc">
+    <iconset>
      <normaloff>:/media-playback-stop.png</normaloff>:/media-playback-stop.png</iconset>
    </property>
    <property name="text">
@@ -527,7 +527,7 @@
     <bool>false</bool>
    </property>
    <property name="icon">
-    <iconset resource="../data/data.qrc">
+    <iconset>
      <normaloff>:/last.fm/love.png</normaloff>:/last.fm/love.png</iconset>
    </property>
    <property name="text">
@@ -539,7 +539,7 @@
     <bool>false</bool>
    </property>
    <property name="icon">
-    <iconset resource="../data/data.qrc">
+    <iconset>
      <normaloff>:/last.fm/ban.png</normaloff>:/last.fm/ban.png</iconset>
    </property>
    <property name="text">
@@ -582,8 +582,6 @@
    <header>radioview.h</header>
   </customwidget>
  </customwidgets>
- <resources>
-  <include location="../data/data.qrc"/>
- </resources>
+ <resources/>
  <connections/>
 </ui>
diff --git a/src/osd.cpp b/src/osd.cpp
index d8263c588..8875c26c1 100644
--- a/src/osd.cpp
+++ b/src/osd.cpp
@@ -1,5 +1,7 @@
 #include "osd.h"
 
+#include <QCoreApplication>
+
 OSD::OSD(QSystemTrayIcon* tray_icon, QObject* parent)
   : QObject(parent),
     tray_icon_(tray_icon),
@@ -23,9 +25,9 @@ void OSD::SongChanged(const Song &song) {
 }
 
 void OSD::Paused() {
-  ShowMessage("Tangerine", "Paused");
+  ShowMessage(QCoreApplication::applicationName(), "Paused");
 }
 
 void OSD::Stopped() {
-  ShowMessage("Tangerine", "Playlist finished");
+  ShowMessage(QCoreApplication::applicationName(), "Playlist finished");
 }
diff --git a/src/osd_x11.cpp b/src/osd_x11.cpp
index 89815c57f..608d6d232 100644
--- a/src/osd_x11.cpp
+++ b/src/osd_x11.cpp
@@ -5,11 +5,12 @@
 
 #include "osd.h"
 
+#include <QCoreApplication>
 #include <QtDebug>
 
 void OSD::Init() {
   notification_ = NULL;
-  notify_init("Tangerine");
+  notify_init(QCoreApplication::applicationName().toUtf8().constData());
 }
 
 void OSD::ShowMessage(const QString& summary, const QString& message,
@@ -27,6 +28,8 @@ void OSD::ShowMessage(const QString& summary, const QString& message,
         STR(summary), STR(message), STR(icon), NULL);
   }
 
+  #undef STR
+
   notify_notification_set_urgency(notification_, NOTIFY_URGENCY_LOW);
   notify_notification_set_timeout(notification_, timeout_);
 
diff --git a/src/playlist.cpp b/src/playlist.cpp
index 726bbbcda..caa7bafbe 100644
--- a/src/playlist.cpp
+++ b/src/playlist.cpp
@@ -15,7 +15,7 @@
 
 #include <lastfm/ScrobblePoint>
 
-const char* Playlist::kRowsMimetype = "application/x-tangerine-playlist-rows";
+const char* Playlist::kRowsMimetype = "application/x-clementine-playlist-rows";
 const char* Playlist::kSettingsGroup = "Playlist";
 
 Playlist::Playlist(QObject *parent) :
diff --git a/src/src.pro b/src/src.pro
index 2ff8d69b4..d27e1c672 100644
--- a/src/src.pro
+++ b/src/src.pro
@@ -5,7 +5,7 @@ QT += sql \
     network \
     opengl \
     xml
-TARGET = tangerine
+TARGET = clementine
 TEMPLATE = app
 SOURCES += main.cpp \
     mainwindow.cpp \