diff --git a/GSv6Fwd/GSv6Fwd.rc b/GSv6Fwd/GSv6Fwd.rc
index 851fca8..e27396e 100644
--- a/GSv6Fwd/GSv6Fwd.rc
+++ b/GSv6Fwd/GSv6Fwd.rc
@@ -10,7 +10,7 @@ BEGIN
         BLOCK "040904E4"
         BEGIN
             VALUE "CompanyName",        VER_COMPANYNAME_STR
-            VALUE "FileDescription",    "IPv6 Forwarder for GameStream"
+            VALUE "FileDescription",    "Moonlight IPv6 Forwarding Service"
             VALUE "ProductName",        VER_PRODUCTNAME_STR
             VALUE "FileVersion",        VER_VERSION_STR
             VALUE "ProductVersion",     VER_VERSION_STR
diff --git a/GSv6FwdSetup/Product.wxs b/GSv6FwdSetup/Product.wxs
index 0e20fbb..523a8dd 100644
--- a/GSv6FwdSetup/Product.wxs
+++ b/GSv6FwdSetup/Product.wxs
@@ -20,7 +20,7 @@
   <Fragment>
     <Directory Id="TARGETDIR" Name="SourceDir">
       <Directory Id="ProgramFilesFolder">
-        <Directory Id="INSTALLFOLDER" Name="IPv6 Forwarder for GameStream" />
+        <Directory Id="INSTALLFOLDER" Name="Moonlight Internet Hosting Tool" />
       </Directory>
       <Directory Id="CommonAppDataFolder">
         <Directory Name="MISS" Id="MISSLogFolder" />
@@ -34,15 +34,15 @@
         <File Source="$(var.GSv6Fwd.TargetPath)" KeyPath="yes" Id="GSv6FwdExe">
           <fire:FirewallException Id="FwException"
                                   Scope="any"
-                                  Name="IPv6 Forwarder for GS Protocol"/>
+                                  Name="Moonlight IPv6 Forwarding Service"/>
         </File>
         <CreateFolder Directory="MISSLogFolder">
           <util:PermissionEx User="NT SERVICE\GSv6FwdSvc" GenericAll="yes" />
         </CreateFolder>
         <ServiceInstall Type="ownProcess"
                         Name="GSv6FwdSvc"
-                        DisplayName="IPv6 Forwarder for GS Protocol"
-                        Description="Provides access to GameStream servers over IPv6 networks"
+                        DisplayName="Moonlight IPv6 Forwarding Service"
+                        Description="Allows Moonlight clients to connect to this PC over IPv6 networks"
                         Start="auto"
                         Account="NT AUTHORITY\LocalService"
                         ErrorControl="ignore"
diff --git a/version.h b/version.h
index 48217ec..61ab910 100644
--- a/version.h
+++ b/version.h
@@ -4,4 +4,4 @@
 #define VER_VERSION_STR             "2.1.0.0"
 
 #define VER_COMPANYNAME_STR         "Moonlight Game Streaming Project"
-#define VER_PRODUCTNAME_STR         "Moonlight Internet Streaming Helper"
+#define VER_PRODUCTNAME_STR         "Moonlight Internet Hosting Tool"