diff --git a/app/main.cpp b/app/main.cpp
index dd424fb0..154c83a3 100644
--- a/app/main.cpp
+++ b/app/main.cpp
@@ -131,6 +131,13 @@ void qtLogToDiskHandler(QtMsgType type, const QMessageLogContext&, const QString
 
 int main(int argc, char *argv[])
 {
+    // Set these here to allow us to use the default QSettings constructor.
+    // These also ensure that our cache directory is named correctly. As such,
+    // it is critical that these be called before Path::initialize().
+    QCoreApplication::setOrganizationName("Moonlight Game Streaming Project");
+    QCoreApplication::setOrganizationDomain("moonlight-stream.com");
+    QCoreApplication::setApplicationName("Moonlight");
+
     if (QFile(QDir::currentPath() + "/portable.dat").exists()) {
         qInfo() << "Running in portable mode from:" << QDir::currentPath();
         QSettings::setDefaultFormat(QSettings::IniFormat);
@@ -172,11 +179,6 @@ int main(int argc, char *argv[])
     qputenv("QT_OPENGL", "angle");
 #endif
 
-    // Set these here to allow us to use the default QSettings constructor
-    QCoreApplication::setOrganizationName("Moonlight Game Streaming Project");
-    QCoreApplication::setOrganizationDomain("moonlight-stream.com");
-    QCoreApplication::setApplicationName("Moonlight");
-
     // Register custom metatypes for use in signals
     qRegisterMetaType<NvApp>("NvApp");
 
diff --git a/wix/Moonlight/Product.wxs b/wix/Moonlight/Product.wxs
index a9ab2b9f..4a9fd256 100644
--- a/wix/Moonlight/Product.wxs
+++ b/wix/Moonlight/Product.wxs
@@ -39,7 +39,7 @@
       </Directory>
     </Directory>
 
-    <Property Id="APPDATAFOLDER">%LOCALAPPDATA%\Moonlight Game Streaming</Property>
+    <Property Id="APPDATAFOLDER">%LOCALAPPDATA%\Moonlight Game Streaming Project</Property>
 
     <!-- There's no way to delete a registry key on uninstall but not major upgrade, so
         we have to roll our own deletion via custom action -->