diff --git a/src/calamares/CalamaresApplication.cpp b/src/calamares/CalamaresApplication.cpp
index 601f6b388..2bb0af8df 100644
--- a/src/calamares/CalamaresApplication.cpp
+++ b/src/calamares/CalamaresApplication.cpp
@@ -44,7 +44,12 @@ CalamaresApplication::CalamaresApplication( int& argc, char* argv[] )
     , m_moduleManager( nullptr )
     , m_debugMode( false )
 {
-    setOrganizationName( QLatin1String( CALAMARES_ORGANIZATION_NAME ) );
+    // Setting the organization name makes the default cache
+    // directory -- where Calamares stores logs, for instance --
+    // <org>/<app>/, so we end up with ~/.cache/Calamares/calamares/
+    // which is excessively squidly.
+    //
+    // setOrganizationName( QLatin1String( CALAMARES_ORGANIZATION_NAME ) );
     setOrganizationDomain( QLatin1String( CALAMARES_ORGANIZATION_DOMAIN ) );
     setApplicationName( QLatin1String( CALAMARES_APPLICATION_NAME ) );
     setApplicationVersion( QLatin1String( CALAMARES_VERSION ) );
diff --git a/src/libcalamares/utils/Logger.cpp b/src/libcalamares/utils/Logger.cpp
index 85a05d22b..5c17cdddc 100644
--- a/src/libcalamares/utils/Logger.cpp
+++ b/src/libcalamares/utils/Logger.cpp
@@ -119,7 +119,7 @@ CalamaresLogHandler( QtMsgType type, const QMessageLogContext& context, const QS
 QString
 logFile()
 {
-    return CalamaresUtils::appLogDir().filePath( "Calamares.log" );
+    return CalamaresUtils::appLogDir().filePath( "session.log" );
 }