diff --git a/app/Info.plist b/app/Info.plist
index 8c08c73b..5d419fd4 100644
--- a/app/Info.plist
+++ b/app/Info.plist
@@ -5,7 +5,7 @@
 	<key>CFBundleExecutable</key>
 	<string>Moonlight</string>
 	<key>CFBundleGetInfoString</key>
-	<string>Stream games from your NVIDIA GameStream-enabled PC</string>
+	<string>Stream games and other applications from another PC</string>
 	<key>CFBundleIconFile</key>
 	<string>moonlight</string>
 	<key>CFBundleIdentifier</key>
diff --git a/app/backend/nvhttp.cpp b/app/backend/nvhttp.cpp
index ce1b5324..258f6593 100644
--- a/app/backend/nvhttp.cpp
+++ b/app/backend/nvhttp.cpp
@@ -362,7 +362,7 @@ NvHTTP::verifyResponseStatus(QString xml)
         }
     }
 
-    throw GfeHttpResponseException(-1, "Malformed GFE XML (missing root element)");
+    throw GfeHttpResponseException(-1, "Malformed XML (missing root element)");
 }
 
 QImage
diff --git a/app/deploy/linux/com.moonlight_stream.Moonlight.appdata.xml b/app/deploy/linux/com.moonlight_stream.Moonlight.appdata.xml
index cddc7ceb..ced60d8e 100644
--- a/app/deploy/linux/com.moonlight_stream.Moonlight.appdata.xml
+++ b/app/deploy/linux/com.moonlight_stream.Moonlight.appdata.xml
@@ -4,10 +4,10 @@
 	<metadata_license>CC0-1.0</metadata_license>
 	<project_license>GPL-3.0+</project_license>
 	<name>Moonlight</name>
-	<summary>Play games remotely from your NVIDIA GameStream-enabled PC</summary>
+	<summary>Stream games and other applications from another PC running Sunshine or GeForce Experience</summary>
 
 	<description>
-		<p>Moonlight can stream games and other applications from a PC with an NVIDIA GeForce GTX/RTX or NVIDIA Quadro GPU and GeForce/Quadro Experience installed.</p>
+		<p>Moonlight can stream games and other applications from another PC with Sunshine or GeForce Experience software installed.</p>
 		<p>Features include:</p>
 		<ul>
 			<li>Streaming at up to 4K resolution</li>
diff --git a/app/deploy/linux/com.moonlight_stream.Moonlight.desktop b/app/deploy/linux/com.moonlight_stream.Moonlight.desktop
index 4a4f2e24..a393b247 100644
--- a/app/deploy/linux/com.moonlight_stream.Moonlight.desktop
+++ b/app/deploy/linux/com.moonlight_stream.Moonlight.desktop
@@ -1,9 +1,9 @@
 [Desktop Entry]
 Name=Moonlight
-Comment=Stream games from your NVIDIA GameStream-enabled PC
+Comment=Stream games and other applications from another PC running Sunshine or GeForce Experience
 Exec=moonlight
 Icon=moonlight
 Terminal=false
 Type=Application
 Categories=Qt;Game;
-Keywords=nvidia;gamestream;stream;
+Keywords=nvidia;gamestream;stream;sunshine;remote play;
diff --git a/app/gui/PcView.qml b/app/gui/PcView.qml
index ef8be15e..31c1e3e8 100644
--- a/app/gui/PcView.qml
+++ b/app/gui/PcView.qml
@@ -99,7 +99,7 @@ CenteredGridView {
         Label {
             height: searchSpinner.height
             elide: Label.ElideRight
-            text: StreamingPreferences.enableMdns ? qsTr("Searching for PCs on your local network with NVIDIA GameStream enabled...")
+            text: StreamingPreferences.enableMdns ? qsTr("Searching for compatible hosts on your local network...")
                                                   : qsTr("Automatic PC discovery is disabled. Add your PC manually.")
             font.pointSize: 20
             verticalAlignment: Text.AlignVCenter
@@ -291,7 +291,8 @@ CenteredGridView {
 
         // don't allow edits to the rest of the window while open
         property string pin : "0000"
-        text:qsTr("Please enter %1 on your GameStream PC. This dialog will close when pairing is completed.").arg(pin)
+        text:qsTr("Please enter %1 on your host PC. This dialog will close when pairing is completed.").arg(pin)+"\n\n"+
+             qsTr("If your host PC is running Sunshine, navigate to the Sunshine web UI to enter the PIN.")
         standardButtons: Dialog.Cancel
         onRejected: {
             // FIXME: We should interrupt pairing here
@@ -319,7 +320,7 @@ CenteredGridView {
         standardButtons: Dialog.Ok
 
         onAboutToShow: {
-            testConnectionDialog.text = qsTr("Moonlight is testing your network connection to determine if NVIDIA GameStream is blocked.") + "\n\n" + qsTr("This may take a few seconds…")
+            testConnectionDialog.text = qsTr("Moonlight is testing your network connection to determine if any required ports are blocked.") + "\n\n" + qsTr("This may take a few seconds…")
             showSpinner = true
         }
 
diff --git a/app/gui/main.qml b/app/gui/main.qml
index 49eb9395..423485cd 100644
--- a/app/gui/main.qml
+++ b/app/gui/main.qml
@@ -488,7 +488,7 @@ ApplicationWindow {
 
     NavigableDialog {
         id: addPcDialog
-        property string label: qsTr("Enter the IP address of your GameStream PC:")
+        property string label: qsTr("Enter the IP address of your host PC:")
 
         standardButtons: Dialog.Ok | Dialog.Cancel
 
diff --git a/app/streaming/session.cpp b/app/streaming/session.cpp
index 8b93b8a3..ea21cbdb 100644
--- a/app/streaming/session.cpp
+++ b/app/streaming/session.cpp
@@ -115,8 +115,7 @@ void Session::clConnectionTerminated(int errorCode)
     case ML_ERROR_UNEXPECTED_EARLY_TERMINATION:
         s_ActiveSession->m_UnexpectedTermination = true;
         emit s_ActiveSession->displayLaunchError(tr("Something went wrong on your host PC when starting the stream.") + "\n\n" +
-                                                 tr("Make sure you don't have any DRM-protected content open on your host PC. You can also try restarting your host PC.") + "\n\n" +
-                                                 tr("If the issue persists, try reinstalling your GPU drivers and GeForce Experience."));
+                                                 tr("Make sure you don't have any DRM-protected content open on your host PC. You can also try restarting your host PC."));
         break;
 
     case ML_ERROR_FRAME_CONVERSION:
@@ -700,8 +699,7 @@ bool Session::validateLaunch(SDL_Window* testWindow)
 
         if (m_Computer->maxLumaPixelsHEVC == 0) {
             if (hevcForced) {
-                emitLaunchWarning(tr("Your host PC GPU doesn't support HEVC. "
-                                     "A GeForce GTX 900-series (Maxwell) or later GPU is required for HEVC streaming."));
+                emitLaunchWarning(tr("Your host PC doesn't support encoding HEVC."));
             }
 
             // Moonlight-common-c will handle this case already, but we want
@@ -755,8 +753,7 @@ bool Session::validateLaunch(SDL_Window* testWindow)
 
         // Check that the server GPU supports HDR
         if (!(m_Computer->serverCodecModeSupport & 0x200)) {
-            emitLaunchWarning(tr("Your host PC GPU doesn't support HDR streaming. "
-                                 "A GeForce GTX 1000-series (Pascal) or later GPU is required for HDR streaming."));
+            emitLaunchWarning(tr("Your host PC doesn't support HDR streaming."));
         }
         else if (!isHardwareDecodeAvailable(testWindow,
                                             m_Preferences->videoDecoderSelection,
@@ -1181,7 +1178,7 @@ bool Session::startConnectionAsync()
                       !m_Preferences->multiController,
                       rtspSessionUrl);
     } catch (const GfeHttpResponseException& e) {
-        emit displayLaunchError(tr("GeForce Experience returned error: %1").arg(e.toQString()));
+        emit displayLaunchError(tr("Host returned error: %1").arg(e.toQString()));
         return false;
     } catch (const QtNetworkReplyException& e) {
         emit displayLaunchError(e.toQString());
diff --git a/wix/Moonlight/Product.wxs b/wix/Moonlight/Product.wxs
index 1d648e7f..0943f4cc 100644
--- a/wix/Moonlight/Product.wxs
+++ b/wix/Moonlight/Product.wxs
@@ -4,7 +4,7 @@
 <?define FullName = "Moonlight Game Streaming Client" ?>
 
 <?define ShortcutName = "$(var.ShortName)" ?>
-<?define ShortcutDesc = "Stream games from your NVIDIA GameStream-enabled PC" ?>
+<?define ShortcutDesc = "Stream games and other applications from another PC" ?>
 <?define InstallFolder = "Moonlight Game Streaming" ?>
 
 <Wix xmlns="http://schemas.microsoft.com/wix/2006/wi"