diff --git a/src/ScenarioRepository.cpp b/src/ScenarioRepository.cpp
index 85d17fd016..ade623ffd8 100644
--- a/src/ScenarioRepository.cpp
+++ b/src/ScenarioRepository.cpp
@@ -142,7 +142,7 @@ public:
 
         // Scan RCT2 directory
         std::string rct2dir = _env->GetDirectoryPath(DIRBASE::RCT2, DIRID::SCENARIO);
-        std::string openrct2dir = _env->GetDirectoryPath(DIRBASE::OPENRCT2, DIRID::SCENARIO);
+        std::string openrct2dir = _env->GetDirectoryPath(DIRBASE::USER, DIRID::SCENARIO);
         Scan(rct2dir);
         Scan(openrct2dir);
 
diff --git a/src/object/ObjectRepository.cpp b/src/object/ObjectRepository.cpp
index 6b7c524bec..da02d6ab62 100644
--- a/src/object/ObjectRepository.cpp
+++ b/src/object/ObjectRepository.cpp
@@ -118,7 +118,7 @@ public:
         _queryDirectoryResult = { 0 };
 
         const std::string &rct2Path = _env->GetDirectoryPath(DIRBASE::RCT2, DIRID::OBJECT);
-        const std::string &openrct2Path = _env->GetDirectoryPath(DIRBASE::OPENRCT2, DIRID::OBJECT);
+        const std::string &openrct2Path = _env->GetDirectoryPath(DIRBASE::USER, DIRID::OBJECT);
         QueryDirectory(&_queryDirectoryResult, rct2Path);
         QueryDirectory(&_queryDirectoryResult, openrct2Path);
 
@@ -252,7 +252,7 @@ private:
         stopwatch.Start();
 
         const std::string &rct2Path = _env->GetDirectoryPath(DIRBASE::RCT2, DIRID::OBJECT);
-        const std::string &openrct2Path = _env->GetDirectoryPath(DIRBASE::OPENRCT2, DIRID::OBJECT);
+        const std::string &openrct2Path = _env->GetDirectoryPath(DIRBASE::USER, DIRID::OBJECT);
         ScanDirectory(rct2Path);
         ScanDirectory(openrct2Path);
 
diff --git a/src/ride/TrackDesignRepository.cpp b/src/ride/TrackDesignRepository.cpp
index 0ff2c72388..623340e06f 100644
--- a/src/ride/TrackDesignRepository.cpp
+++ b/src/ride/TrackDesignRepository.cpp
@@ -127,7 +127,7 @@ public:
     void Scan() override
     {
         std::string rct2Directory = _env->GetDirectoryPath(DIRBASE::RCT2, DIRID::TRACK);
-        std::string userDirectory = _env->GetDirectoryPath(DIRBASE::OPENRCT2, DIRID::TRACK);
+        std::string userDirectory = _env->GetDirectoryPath(DIRBASE::USER, DIRID::TRACK);
 
         _items.clear();
         _directoryQueryResult = { 0 };