diff --git a/components/files/configurationmanager.cpp b/components/files/configurationmanager.cpp
index ffa911b44f..58d75d1fd7 100644
--- a/components/files/configurationmanager.cpp
+++ b/components/files/configurationmanager.cpp
@@ -18,7 +18,7 @@ static const char* const openmwCfgFile = "openmw.cfg";
 
 const char* const mwToken = "?mw?";
 const char* const localToken = "?local?";
-const char* const userToken = "?user?";
+const char* const userDataToken = "?userdata?";
 const char* const globalToken = "?global?";
 
 ConfigurationManager::ConfigurationManager()
@@ -40,7 +40,7 @@ void ConfigurationManager::setupTokensMapping()
 {
     mTokensMapping.insert(std::make_pair(mwToken, &FixedPath<>::getInstallPath));
     mTokensMapping.insert(std::make_pair(localToken, &FixedPath<>::getLocalPath));
-    mTokensMapping.insert(std::make_pair(userToken, &FixedPath<>::getUserConfigPath));
+    mTokensMapping.insert(std::make_pair(userDataToken, &FixedPath<>::getUserDataPath));
     mTokensMapping.insert(std::make_pair(globalToken, &FixedPath<>::getGlobalDataPath));
 }
 
diff --git a/files/openmw.cfg b/files/openmw.cfg
index 4633141a69..b67b79a964 100644
--- a/files/openmw.cfg
+++ b/files/openmw.cfg
@@ -1,4 +1,4 @@
 data="?global?data"
 data="?mw?Data Files"
-data-local="?user?data"
+data-local="?userdata?data"
 resources=${OPENMW_RESOURCE_FILES}
diff --git a/files/openmw.cfg.local b/files/openmw.cfg.local
index d6ca2d5549..6a578542df 100644
--- a/files/openmw.cfg.local
+++ b/files/openmw.cfg.local
@@ -1,5 +1,5 @@
 data="?global?data"
 data="?mw?Data Files"
 data=./data
-data-local="?user?data"
+data-local="?userdata?data"
 resources=./resources