diff --git a/CMakeLists.txt b/CMakeLists.txt
index abf1e69e97..147b1d47e0 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -3,7 +3,7 @@ set(CMAKE_CXX_STANDARD 17)
 set(CMAKE_CXX_STANDARD_REQUIRED ON)
 
 include(VERSION.cmake)
-project(owncloud-client LANGUAGES CXX C VERSION ${MIRALL_VERSION_MAJOR}.${MIRALL_VERSION_MINOR}.${MIRALL_VERSION_PATCH})
+project(OpenCloudDesktop LANGUAGES CXX C VERSION ${MIRALL_VERSION_MAJOR}.${MIRALL_VERSION_MINOR}.${MIRALL_VERSION_PATCH})
 include(FeatureSummary)
 
 find_package(ECM 6.0.0 REQUIRED NO_MODULE)
diff --git a/admin/osx/CMakeLists.txt b/admin/osx/CMakeLists.txt
index 93c1d7229e..62405e3c09 100644
--- a/admin/osx/CMakeLists.txt
+++ b/admin/osx/CMakeLists.txt
@@ -1,6 +1,6 @@
 
 # Check if variable MAC_INSTALLER_BACKGROUND_FILE is defined. That might come
-# from the OEM.cmake for branded clients or from OWNCLOUD.cmake for the non
+# from the OEM.cmake for branded clients or from OPENCLOUD.cmake for the non
 # branded client.
 # Make sure that the MAC_INSTALLER_BACKGROUND_FILE contains the full path, ie.
 # includes CMAKE_SOURCE_DIR or so.
diff --git a/shell_integration/windows/OCOverlays/OverlayConstants.h b/shell_integration/windows/OCOverlays/OverlayConstants.h
index 06c58ac37a..f5c98d08f7 100644
--- a/shell_integration/windows/OCOverlays/OverlayConstants.h
+++ b/shell_integration/windows/OCOverlays/OverlayConstants.h
@@ -22,7 +22,7 @@
 #define OVERLAY_GUID_WARNING        L"{0960F096-F328-48A3-B746-276B1E3C3722}"
 #define OVERLAY_GUID_WARNING_SHARED L"{0960F097-F328-48A3-B746-276B1E3C3722}"
 
-#define OVERLAY_GENERIC_NAME        L"ownCloud overlay handler"
+#define OVERLAY_GENERIC_NAME L"OpenCloud overlay handler"
 
 // two spaces to put us ahead of the competition :/
 #define OVERLAY_NAME_ERROR          L"  OCError"
diff --git a/shell_integration/windows/OCUtil/CommunicationSocket.cpp b/shell_integration/windows/OCUtil/CommunicationSocket.cpp
index d2a26099d0..1fe547d1a9 100644
--- a/shell_integration/windows/OCUtil/CommunicationSocket.cpp
+++ b/shell_integration/windows/OCUtil/CommunicationSocket.cpp
@@ -46,7 +46,7 @@ std::wstring getUserName() {
 std::wstring CommunicationSocket::DefaultPipePath()
 {
     auto pipename = std::wstring(L"\\\\.\\pipe\\");
-    pipename += L"ownCloud-";
+    pipename += L"OpenCloud-";
     pipename += getUserName();
     return pipename;
 }
diff --git a/shell_integration/windows/OCUtil/Log.h b/shell_integration/windows/OCUtil/Log.h
index f08974dbec..5ec69db677 100644
--- a/shell_integration/windows/OCUtil/Log.h
+++ b/shell_integration/windows/OCUtil/Log.h
@@ -22,7 +22,7 @@ template <typename T = std::wstring>
 void log(const std::wstring &msg, const T &error = {})
 {
     std::wstringstream tmp;
-    tmp << L"ownCloud ShellExtension: " << msg;
+    tmp << L"OpenCloud ShellExtension: " << msg;
     if (!error.empty()) {
         tmp << L" " << error.data();
     }
diff --git a/shell_integration/windows/OCUtil/UtilConstants.h b/shell_integration/windows/OCUtil/UtilConstants.h
index 04ca7d3ba7..2742b295e3 100644
--- a/shell_integration/windows/OCUtil/UtilConstants.h
+++ b/shell_integration/windows/OCUtil/UtilConstants.h
@@ -25,6 +25,5 @@
 #define QUOTE							L"\""
 #define VALUE							L"value"
 
-#define REGISTRY_ROOT_KEY			 L"SOFTWARE\\ownCloud Inc\\ownCloud"
 #define REGISTRY_ENABLE_OVERLAY		 L"EnableOverlay"
 #define REGISTRY_FILTER_FOLDER		 L"FilterFolder"
diff --git a/src/cmd/cmd.cpp b/src/cmd/cmd.cpp
index a9b4a11c0c..4bd71671ee 100644
--- a/src/cmd/cmd.cpp
+++ b/src/cmd/cmd.cpp
@@ -426,7 +426,6 @@ int main(int argc, char **argv)
             // Find the folder and the original owncloud URL
             QStringList splitted = tmp.path().split(ctx.account->davPath());
             tmp.setPath(splitted.value(0));
-            tmp.setScheme(tmp.scheme().replace(QLatin1String("owncloud"), QLatin1String("http")));
             return tmp;
         }();
 
diff --git a/src/common/plugin.cpp b/src/common/plugin.cpp
index ec3a3f1575..0a2c4cb701 100644
--- a/src/common/plugin.cpp
+++ b/src/common/plugin.cpp
@@ -24,7 +24,7 @@ PluginFactory::~PluginFactory() = default;
 
 QString pluginFileName(const QString &type, const QString &name)
 {
-    return QStringLiteral("ownCloud_%2_%3").arg(type, name);
+    return QStringLiteral("OpenCloud_%2_%3").arg(type, name);
 }
 
 }
diff --git a/src/common/plugin.h b/src/common/plugin.h
index 3d28f7dd3f..acb3bba911 100644
--- a/src/common/plugin.h
+++ b/src/common/plugin.h
@@ -45,4 +45,4 @@ QString pluginFileName(const QString &type, const QString &name);
 
 }
 
-Q_DECLARE_INTERFACE(OCC::PluginFactory, "org.owncloud.PluginFactory")
+Q_DECLARE_INTERFACE(OCC::PluginFactory, "eu.opencloud.PluginFactory")
diff --git a/src/common/vfs.cpp b/src/common/vfs.cpp
index e175b28100..358f1a97fe 100644
--- a/src/common/vfs.cpp
+++ b/src/common/vfs.cpp
@@ -205,7 +205,7 @@ bool OCC::VfsPluginManager::isVfsPluginAvailable(Vfs::Mode mode) const
             qCDebug(lcPlugin) << "Plugin doesn't exist:" << loader.fileName() << "LibraryPath:" << QCoreApplication::libraryPaths();
             return false;
         }
-        if (basemeta[QStringLiteral("IID")].toString() != QLatin1String("org.owncloud.PluginFactory")) {
+        if (basemeta[QStringLiteral("IID")].toString() != QLatin1String("eu.opencloud.PluginFactory")) {
             qCWarning(lcPlugin) << "Plugin has wrong IID" << loader.fileName() << basemeta[QStringLiteral("IID")];
             return false;
         }
diff --git a/src/gui/aboutdialog.cpp b/src/gui/aboutdialog.cpp
index e02d97d92d..131bcaef4d 100644
--- a/src/gui/aboutdialog.cpp
+++ b/src/gui/aboutdialog.cpp
@@ -85,8 +85,7 @@ void AboutDialog::setupUpdaterWidget()
     }
     // we want to attach the known english identifiers which are also used within the configuration file as user data inside the data model
     // that way, when we intend to reset to the original selection when the dialog, we can look up the config file's stored value in the data model
-    ui->updateChannel->addItem(QStringLiteral("ownCloud 10 LTS"), QStringLiteral("stable"));
-    ui->updateChannel->addItem(QStringLiteral("ownCloud Infinite Scale stable"), QStringLiteral("ocis"));
+    ui->updateChannel->addItem(QStringLiteral("stable"), QStringLiteral("stable"));
     if (!Resources::isVanillaTheme()) {
         ui->updateChannel->addItem(tr("beta"), QStringLiteral("beta"));
     }
@@ -158,8 +157,7 @@ void AboutDialog::slotUpdateChannelChanged([[maybe_unused]] int index)
 
     auto msgBox = new QMessageBox(QMessageBox::Warning, tr("Change update channel?"),
         tr("<html>The update channel determines which client updates will be offered for installation.<ul>"
-           "<li>\"ownCloud 10 LTS\" contains only upgrades that are considered reliable</li>"
-           "<li>\"ownCloud Infinite Scale stable\" contains only upgrades that are considered reliable but <b>removes support for \"ownCloud 10\"</b></li>"
+           "<li>\"stable\" contains only upgrades that are considered reliable</li>"
            "%1"
            "</ul>"
            "<br>⚠️Downgrades are not supported. If you switch to a stable channel this change will only be applied with the next major release.</html>")
diff --git a/src/gui/connectionvalidator.cpp b/src/gui/connectionvalidator.cpp
index 5b08c2f3a8..19aeb23bcf 100644
--- a/src/gui/connectionvalidator.cpp
+++ b/src/gui/connectionvalidator.cpp
@@ -155,9 +155,7 @@ void ConnectionValidator::slotCheckServerAndAuth()
 void ConnectionValidator::slotStatusFound(const QUrl &url, const QJsonObject &info)
 {
     // status.php was found.
-    qCInfo(lcConnectionValidator) << "** Application: ownCloud found: "
-                                  << url << " with version "
-                                  << info.value(QLatin1String("versionstring")).toString();
+    qCInfo(lcConnectionValidator) << "** Application: OpenCloud found: " << url << " with version " << info.value(QLatin1String("versionstring")).toString();
 
     // Update server URL in case of redirection
     if (_account->url() != url) {
diff --git a/src/gui/folder.cpp b/src/gui/folder.cpp
index 7db47008c5..5b52661558 100644
--- a/src/gui/folder.cpp
+++ b/src/gui/folder.cpp
@@ -1208,7 +1208,7 @@ void Folder::registerFolderWatcher()
     connect(_folderWatcher.data(), &FolderWatcher::becameUnreliable,
         this, &Folder::slotWatcherUnreliable);
     _folderWatcher->init(path());
-    _folderWatcher->startNotificatonTest(path() + QLatin1String(".owncloudsync.log"));
+    _folderWatcher->startNotificatonTest(path() + QLatin1String(".OpenCloudSync.log"));
 }
 
 bool Folder::virtualFilesEnabled() const
diff --git a/src/gui/guiutility.cpp b/src/gui/guiutility.cpp
index e995b68c95..32c4be7e55 100644
--- a/src/gui/guiutility.cpp
+++ b/src/gui/guiutility.cpp
@@ -32,12 +32,12 @@ Q_LOGGING_CATEGORY(lcGuiUtility, "gui.utility", QtInfoMsg)
 namespace {
 const QString dirTag()
 {
-    return QStringLiteral("com.owncloud.spaces.app");
+    return QStringLiteral("eu.opencloud.spaces.app");
 }
 
 const QString uuidTag()
 {
-    return QStringLiteral("com.owncloud.spaces.account-uuid");
+    return QStringLiteral("eu.opencloud.spaces.account-uuid");
 }
 } // anonymous namespace
 
diff --git a/src/gui/guiutility_unix.cpp b/src/gui/guiutility_unix.cpp
index db4210fe20..647dc74c10 100644
--- a/src/gui/guiutility_unix.cpp
+++ b/src/gui/guiutility_unix.cpp
@@ -25,7 +25,7 @@ void Utility::startShellIntegration()
 
 QString Utility::socketApiSocketPath()
 {
-    return QStringLiteral("%1/ownCloud/socket").arg(QStandardPaths::writableLocation(QStandardPaths::RuntimeLocation));
+    return QStringLiteral("%1/OpenCloud/socket").arg(QStandardPaths::writableLocation(QStandardPaths::RuntimeLocation));
 }
 
 } // namespace OCC
diff --git a/src/gui/guiutility_win.cpp b/src/gui/guiutility_win.cpp
index 88ea7d2c51..d64a465e23 100644
--- a/src/gui/guiutility_win.cpp
+++ b/src/gui/guiutility_win.cpp
@@ -25,7 +25,7 @@ void Utility::startShellIntegration()
 
 QString Utility::socketApiSocketPath()
 {
-    return QStringLiteral(R"(\\.\pipe\ownCloud-%1)").arg(qEnvironmentVariable("USERNAME"));
+    return QStringLiteral(R"(\\.\pipe\OpenCloud-%1)").arg(qEnvironmentVariable("USERNAME"));
 }
 
 } // namespace OCC
diff --git a/src/gui/main.cpp b/src/gui/main.cpp
index 40a4bbf2e4..493f34a13a 100644
--- a/src/gui/main.cpp
+++ b/src/gui/main.cpp
@@ -100,11 +100,11 @@ CommandLineOptions parseOptions(const QStringList &arguments)
                                  .arg(Theme::instance()->appName(), OCC::Version::displayString())
                           << Qt::endl;
 
-    if (Theme::instance()->appName() == QLatin1String("ownCloud")) {
+    if (Resources::isVanillaTheme()) {
         descriptionTextStream
             << Qt::endl
             << Qt::endl
-            << QApplication::translate("CommandLine", "For more information, see %1", "link to homepage").arg(QStringLiteral("https://www.owncloud.com"));
+            << QApplication::translate("CommandLine", "For more information, see %1", "link to homepage").arg(QStringLiteral("https://www.opencloud.eu"));
     }
 
     parser.setApplicationDescription(descriptionText);
diff --git a/src/gui/newwizard/jobs/webfingeruserinfojobfactory.cpp b/src/gui/newwizard/jobs/webfingeruserinfojobfactory.cpp
index 224208577a..7309ce2d61 100644
--- a/src/gui/newwizard/jobs/webfingeruserinfojobfactory.cpp
+++ b/src/gui/newwizard/jobs/webfingeruserinfojobfactory.cpp
@@ -15,6 +15,7 @@
 #include "webfingeruserinfojobfactory.h"
 #include "common/utility.h"
 #include "creds/httpcredentials.h"
+#include "creds/webfinger.h"
 
 #include <QApplication>
 #include <QJsonArray>
@@ -83,7 +84,7 @@ CoreJob *WebFingerInstanceLookupJobFactory::startJob(const QUrl &url, QObject *p
             const QString rel = linkObject.value(QStringLiteral("rel")).toString();
             const QString href = linkObject.value(QStringLiteral("href")).toString();
 
-            if (rel != QStringLiteral("http://webfinger.owncloud/rel/server-instance")) {
+            if (rel != WebFinger::relId()) {
                 qCDebug(lcWebFingerUserInfoJob) << "skipping invalid link" << href << "with rel" << rel;
                 continue;
             }
diff --git a/src/gui/qmlutils.cpp b/src/gui/qmlutils.cpp
index 8c6c5278b8..c84e52fc2c 100644
--- a/src/gui/qmlutils.cpp
+++ b/src/gui/qmlutils.cpp
@@ -36,7 +36,7 @@ void OCC::QmlUtils::OCQuickWidget::setOCContext(const QUrl &src, QWidget *parent
     rootContext()->setContextProperty(QStringLiteral("ocQuickWidget"), this);
     rootContext()->setContextProperty(QStringLiteral("ocContext"), ocContext);
     engine()->setObjectOwnership(ocContext, ownership);
-    engine()->addImageProvider(QStringLiteral("ownCloud"), new OCC::Resources::CoreImageProvider());
+    engine()->addImageProvider(QStringLiteral("OpenCloud"), new OCC::Resources::CoreImageProvider());
     setResizeMode(QQuickWidget::SizeRootObjectToView);
 
     // Ensure the parent widget used OC_DECLARE_WIDGET_FOCUS
diff --git a/src/gui/socketapi/socketapi.cpp b/src/gui/socketapi/socketapi.cpp
index b2911aa43a..a9b2f54400 100644
--- a/src/gui/socketapi/socketapi.cpp
+++ b/src/gui/socketapi/socketapi.cpp
@@ -499,7 +499,7 @@ void SocketApi::command_VERSION(const QString &, SocketListener *listener)
 
 void SocketApi::command_SHARE_MENU_TITLE(const QString &, SocketListener *listener)
 {
-    listener->sendMessage(QLatin1String("SHARE_MENU_TITLE:") + tr("Share with %1", "parameter is ownCloud").arg(Theme::instance()->appNameGUI()));
+    listener->sendMessage(QLatin1String("SHARE_MENU_TITLE:") + tr("Share with %1", "parameter is OpenCloud").arg(Theme::instance()->appNameGUI()));
 }
 
 class GetOrCreatePublicLinkShare : public QObject
diff --git a/src/gui/syncrunfilelog.cpp b/src/gui/syncrunfilelog.cpp
index 599bdc1b2b..2627248b52 100644
--- a/src/gui/syncrunfilelog.cpp
+++ b/src/gui/syncrunfilelog.cpp
@@ -38,7 +38,7 @@ void SyncRunFileLog::start(const QString &folderPath)
     const qint64 logfileMaxSize = 10 * 1024 * 1024; // 10MiB
 
     // Note; this name is ignored in csync_exclude.c
-    const QString filename = folderPath + QStringLiteral(".owncloudsync.log");
+    const QString filename = folderPath + QStringLiteral(".OpenCloud.log");
 
     // When the file is too big, just rename it to an old name.
     QFileInfo info(filename);
diff --git a/src/gui/updater/updateinfo.cpp b/src/gui/updater/updateinfo.cpp
index d2c7531dda..ab055e62ba 100644
--- a/src/gui/updater/updateinfo.cpp
+++ b/src/gui/updater/updateinfo.cpp
@@ -53,8 +53,8 @@ QString UpdateInfo::downloadUrl() const
 
 UpdateInfo UpdateInfo::parseElement(const QDomElement &element, bool *ok)
 {
-    if (element.tagName() != QLatin1String("owncloudclient")) {
-        qCCritical(lcUpdater) << "Expected 'owncloudclient', got '" << element.tagName() << "'.";
+    if (element.tagName() != QLatin1String("OpenCloud")) {
+        qCCritical(lcUpdater) << "Expected 'OpenCloud', got '" << element.tagName() << "'.";
         if (ok)
             *ok = false;
         return UpdateInfo();
diff --git a/src/libsync/configfile.cpp b/src/libsync/configfile.cpp
index 56163f85c6..ad31c15b95 100644
--- a/src/libsync/configfile.cpp
+++ b/src/libsync/configfile.cpp
@@ -739,7 +739,7 @@ bool ConfigFile::monoIcons() const
     bool monoDefault = false; // On Mac we want bw by default
 #ifdef Q_OS_MAC
     // OEM themes are not obliged to ship mono icons
-    monoDefault = Theme::instance()->appNameGUI() == QStringLiteral("ownCloud");
+    monoDefault = Resources::isVanillaTheme();
 #endif
     return settings.value(monoIconsC(), monoDefault).toBool();
 }
diff --git a/src/libsync/creds/httpcredentials.cpp b/src/libsync/creds/httpcredentials.cpp
index 4fd0e7100e..0556f21ba4 100644
--- a/src/libsync/creds/httpcredentials.cpp
+++ b/src/libsync/creds/httpcredentials.cpp
@@ -37,7 +37,7 @@ namespace {
 constexpr int TokenRefreshMaxRetries = 3;
 constexpr std::chrono::seconds TokenRefreshDefaultTimeout = 30s;
 constexpr int CredentialVersion = 1;
-const char authenticationFailedC[] = "owncloud-authentication-failed";
+const char authenticationFailedC[] = "opencloud-authentication-failed";
 
 auto isOAuthC()
 {
diff --git a/src/libsync/creds/webfinger.cpp b/src/libsync/creds/webfinger.cpp
index 202d51cb38..55c9045c72 100644
--- a/src/libsync/creds/webfinger.cpp
+++ b/src/libsync/creds/webfinger.cpp
@@ -27,14 +27,6 @@
 
 Q_LOGGING_CATEGORY(lcWebFinger, "sync.credentials.webfinger", QtInfoMsg)
 
-namespace {
-
-auto relId()
-{
-    return QStringLiteral("http://webfinger.owncloud/rel/server-instance");
-}
-}
-
 using namespace OCC;
 
 WebFinger::WebFinger(QNetworkAccessManager *nam, QObject *parent)
@@ -45,7 +37,7 @@ WebFinger::WebFinger(QNetworkAccessManager *nam, QObject *parent)
 
 void WebFinger::start(const QUrl &url, const QString &resourceId)
 {
-    //    GET /.well-known/webfinger?rel=http://webfinger.owncloud/rel/server-instance&resource=acct:test@owncloud.com HTTP/1.1
+    //    GET /.well-known/webfinger?rel=http://webfinger.opencloud.eu/rel/server-instance&resource=acct:test@owncloud.com HTTP/1.1
     if (OC_ENSURE(url.scheme() == QLatin1String("https"))) {
         QUrlQuery query;
         query.setQueryItems({ { QStringLiteral("resource"), QString::fromUtf8(QUrl::toPercentEncoding(resourceId)) },
@@ -93,3 +85,8 @@ const QUrl &WebFinger::href() const
 {
     return _href;
 }
+
+QString WebFinger::relId()
+{
+    return QStringLiteral("http://webfinger.opencloud.eu/rel/server-instance");
+}
diff --git a/src/libsync/creds/webfinger.h b/src/libsync/creds/webfinger.h
index 22037ba394..288715bc1f 100644
--- a/src/libsync/creds/webfinger.h
+++ b/src/libsync/creds/webfinger.h
@@ -35,6 +35,11 @@ class OWNCLOUDSYNC_EXPORT WebFinger : public QObject
 
     const QUrl &href() const;
 
+    /***
+     * ID used to describe our rel attribute
+     */
+    static QString relId();
+
 Q_SIGNALS:
     void finished();
 
diff --git a/src/libsync/propagatedownload.cpp b/src/libsync/propagatedownload.cpp
index a0ffb440a4..2af6b716da 100644
--- a/src/libsync/propagatedownload.cpp
+++ b/src/libsync/propagatedownload.cpp
@@ -706,7 +706,7 @@ void PropagateDownloadFile::slotGetFinished()
 
         if (!_item->_directDownloadUrl.isEmpty() && err != QNetworkReply::OperationCanceledError) {
             // If this was with a direct download, retry without direct download
-            qCWarning(lcPropagateDownload) << "Direct download of" << _item->_directDownloadUrl << "failed. Retrying through owncloud.";
+            qCWarning(lcPropagateDownload) << "Direct download of" << _item->_directDownloadUrl << "failed. Retrying through OpenCloud.";
             _item->_directDownloadUrl.clear();
             start();
             return;
diff --git a/src/plugins/vfs/off/vfs_off.h b/src/plugins/vfs/off/vfs_off.h
index 694b50f5d2..f3e8f6e365 100644
--- a/src/plugins/vfs/off/vfs_off.h
+++ b/src/plugins/vfs/off/vfs_off.h
@@ -60,7 +60,7 @@ public Q_SLOTS:
 class OffVfsPluginFactory : public QObject, public DefaultPluginFactory<VfsOff>
 {
     Q_OBJECT
-    Q_PLUGIN_METADATA(IID "org.owncloud.PluginFactory" FILE "vfspluginmetadata.json")
+    Q_PLUGIN_METADATA(IID "eu.opencloud.PluginFactory" FILE "vfspluginmetadata.json")
     Q_INTERFACES(OCC::PluginFactory)
 };
 
diff --git a/test/manual/windows close event/main.cpp b/test/manual/windows close event/main.cpp
index 71a87a49c3..538ea4a331 100644
--- a/test/manual/windows close event/main.cpp	
+++ b/test/manual/windows close event/main.cpp	
@@ -81,8 +81,8 @@ int main()
     int argc;
     wchar_t **argv = CommandLineToArgvW(commandLine, &argc);
 
-    const auto process = getHWND(argc == 2 ? argv[1] : L"owncloud.exe");
-//    const auto process = getHWND(L"WINDOW_TEST.exe");
+    const auto process = getHWND(argc == 2 ? argv[1] : L"opencloud.exe");
+    //    const auto process = getHWND(L"WINDOW_TEST.exe");
 
     std::wcout << "Query: WM_QUERYENDSESSION" << std::endl;
     broadcast(process, WM_QUERYENDSESSION, 0, ENDSESSION_CLOSEAPP);
diff --git a/test/modeltests/testactivitymodel.cpp b/test/modeltests/testactivitymodel.cpp
index b91510b7bb..78855d382b 100644
--- a/test/modeltests/testactivitymodel.cpp
+++ b/test/modeltests/testactivitymodel.cpp
@@ -32,19 +32,19 @@ private Q_SLOTS:
 
         model->setActivityList({
             Activity{Activity::ActivityType, QStringLiteral("1"), acc1->account(), QStringLiteral("test"), QStringLiteral("test"), QStringLiteral("foo.cpp"),
-                QUrl(QStringLiteral("https://owncloud.com")), QDateTime::currentDateTime()},
+                QUrl(QStringLiteral("https://opencloud.eu")), QDateTime::currentDateTime()},
             Activity{Activity::ActivityType, QStringLiteral("2"), acc1->account(), QStringLiteral("test"), QStringLiteral("test"), QStringLiteral("foo.cpp"),
-                QUrl(QStringLiteral("https://owncloud.com")), QDateTime::currentDateTime()},
+                QUrl(QStringLiteral("https://opencloud.eu")), QDateTime::currentDateTime()},
             Activity{Activity::ActivityType, QStringLiteral("021ad48a-80ae-4af6-b878-aeb836bd367d"), acc2->account(), QStringLiteral("test"),
-                QStringLiteral("test"), QStringLiteral("foo.cpp"), QUrl(QStringLiteral("https://owncloud.com")), QDateTime::currentDateTime()},
+                QStringLiteral("test"), QStringLiteral("foo.cpp"), QUrl(QStringLiteral("https://opencloud.eu")), QDateTime::currentDateTime()},
         });
         model->setActivityList({
             Activity{Activity::ActivityType, QStringLiteral("1"), acc2->account(), QStringLiteral("test"), QStringLiteral("test"), QStringLiteral("foo.cpp"),
-                QUrl(QStringLiteral("https://owncloud.com")), QDateTime::currentDateTime()},
+                QUrl(QStringLiteral("https://opencloud.eu")), QDateTime::currentDateTime()},
             Activity{Activity::ActivityType, QStringLiteral("2"), acc1->account(), QStringLiteral("test"), QStringLiteral("test"), QStringLiteral("foo.cpp"),
-                QUrl(QStringLiteral("https://owncloud.com")), QDateTime::currentDateTime()},
+                QUrl(QStringLiteral("https://opencloud.eu")), QDateTime::currentDateTime()},
             Activity{Activity::ActivityType, QStringLiteral("021ad48a-80ae-4af6-b878-aeb836bd367d"), acc2->account(), QStringLiteral("test"),
-                QStringLiteral("test"), QStringLiteral("foo.cpp"), QUrl(QStringLiteral("https://owncloud.com")), QDateTime::currentDateTime()},
+                QStringLiteral("test"), QStringLiteral("foo.cpp"), QUrl(QStringLiteral("https://opencloud.eu")), QDateTime::currentDateTime()},
         });
         model->slotRemoveAccount(AccountManager::instance()->accounts().first());
     }
diff --git a/test/testexcludedfiles.cpp b/test/testexcludedfiles.cpp
index c60c765e26..7c57b41207 100644
--- a/test/testexcludedfiles.cpp
+++ b/test/testexcludedfiles.cpp
@@ -76,7 +76,7 @@ private Q_SLOTS:
                 workPath += fileName;
                 QFile file(workPath);
                 QVERIFY(file.open(QFile::WriteOnly));
-                file.write("ownCloud");
+                file.write("OpenCloud");
                 file.close();
             };
             if (create) {
diff --git a/test/testfolderman.cpp b/test/testfolderman.cpp
index 347ec64e5e..2685fa83da 100644
--- a/test/testfolderman.cpp
+++ b/test/testfolderman.cpp
@@ -38,8 +38,8 @@ private Q_SLOTS:
         auto dir = TestUtils::createTempDir();
         QVERIFY(dir.isValid());
         QDir dir2(dir.path());
-        QVERIFY(dir2.mkpath(QStringLiteral("sub/ownCloud1/folder/f")));
-        QVERIFY(dir2.mkpath(QStringLiteral("ownCloud2")));
+        QVERIFY(dir2.mkpath(QStringLiteral("sub/OpenCloud1/folder/f")));
+        QVERIFY(dir2.mkpath(QStringLiteral("OpenCloud2")));
         QVERIFY(dir2.mkpath(QStringLiteral("sub/free")));
         QVERIFY(dir2.mkpath(QStringLiteral("free2/sub")));
         {
@@ -53,9 +53,9 @@ private Q_SLOTS:
         FolderMan *folderman = TestUtils::folderMan();
         QCOMPARE(folderman, FolderMan::instance());
         QVERIFY(folderman->addFolder(
-            newAccountState.get(), TestUtils::createDummyFolderDefinition(newAccountState->account(), dirPath + QStringLiteral("/sub/ownCloud1"))));
+            newAccountState.get(), TestUtils::createDummyFolderDefinition(newAccountState->account(), dirPath + QStringLiteral("/sub/OpenCloud1"))));
         QVERIFY(folderman->addFolder(
-            newAccountState.get(), TestUtils::createDummyFolderDefinition(newAccountState->account(), dirPath + QStringLiteral("/ownCloud2"))));
+            newAccountState.get(), TestUtils::createDummyFolderDefinition(newAccountState->account(), dirPath + QStringLiteral("/OpenCloud2"))));
 
         const auto type = FolderMan::NewFolderType::OC10SyncRoot;
         const QUuid uuid = {};
@@ -74,19 +74,19 @@ private Q_SLOTS:
         QVERIFY(!folderman->checkPathValidityForNewFolder(dirPath + QStringLiteral("/sub/file.txt"), type, uuid).isNull());
 
         // The following both fail because they refer to the same account
-        QVERIFY(!folderman->checkPathValidityForNewFolder(dirPath + QStringLiteral("/sub/ownCloud1"), type, uuid).isNull());
-        QVERIFY(!folderman->checkPathValidityForNewFolder(dirPath + QStringLiteral("/ownCloud2/"), type, uuid).isNull());
+        QVERIFY(!folderman->checkPathValidityForNewFolder(dirPath + QStringLiteral("/sub/OpenCloud1"), type, uuid).isNull());
+        QVERIFY(!folderman->checkPathValidityForNewFolder(dirPath + QStringLiteral("/OpenCloud2/"), type, uuid).isNull());
 
         QVERIFY(!folderman->checkPathValidityForNewFolder(dirPath, type, uuid).isNull());
-        QVERIFY(!folderman->checkPathValidityForNewFolder(dirPath + QStringLiteral("/sub/ownCloud1/folder"), type, uuid).isNull());
-        QVERIFY(!folderman->checkPathValidityForNewFolder(dirPath + QStringLiteral("/sub/ownCloud1/folder/f"), type, uuid).isNull());
+        QVERIFY(!folderman->checkPathValidityForNewFolder(dirPath + QStringLiteral("/sub/OpenCloud1/folder"), type, uuid).isNull());
+        QVERIFY(!folderman->checkPathValidityForNewFolder(dirPath + QStringLiteral("/sub/OpenCloud1/folder/f"), type, uuid).isNull());
 
 #ifndef Q_OS_WIN // no links on windows, no permissions
         // make a bunch of links
         QVERIFY(QFile::link(dirPath + QStringLiteral("/sub/free"), dirPath + QStringLiteral("/link1")));
         QVERIFY(QFile::link(dirPath + QStringLiteral("/sub"), dirPath + QStringLiteral("/link2")));
-        QVERIFY(QFile::link(dirPath + QStringLiteral("/sub/ownCloud1"), dirPath + QStringLiteral("/link3")));
-        QVERIFY(QFile::link(dirPath + QStringLiteral("/sub/ownCloud1/folder"), dirPath + QStringLiteral("/link4")));
+        QVERIFY(QFile::link(dirPath + QStringLiteral("/sub/OpenCloud1"), dirPath + QStringLiteral("/link3")));
+        QVERIFY(QFile::link(dirPath + QStringLiteral("/sub/OpenCloud1/folder"), dirPath + QStringLiteral("/link4")));
 
         // Ok
         QVERIFY(folderman->checkPathValidityForNewFolder(dirPath + QStringLiteral("/link1"), type, uuid).isNull());
@@ -102,9 +102,9 @@ private Q_SLOTS:
         QVERIFY(!folderman->checkPathValidityForNewFolder(dirPath + QStringLiteral("/link3/folder"), type, uuid).isNull());
 
         // test some non existing sub path (error)
-        QVERIFY(!folderman->checkPathValidityForNewFolder(dirPath + QStringLiteral("/sub/ownCloud1/some/sub/path"), type, uuid).isNull());
-        QVERIFY(!folderman->checkPathValidityForNewFolder(dirPath + QStringLiteral("/ownCloud2/blublu"), type, uuid).isNull());
-        QVERIFY(!folderman->checkPathValidityForNewFolder(dirPath + QStringLiteral("/sub/ownCloud1/folder/g/h"), type, uuid).isNull());
+        QVERIFY(!folderman->checkPathValidityForNewFolder(dirPath + QStringLiteral("/sub/OpenCloud1/some/sub/path"), type, uuid).isNull());
+        QVERIFY(!folderman->checkPathValidityForNewFolder(dirPath + QStringLiteral("/OpenCloud2/blublu"), type, uuid).isNull());
+        QVERIFY(!folderman->checkPathValidityForNewFolder(dirPath + QStringLiteral("/sub/OpenCloud1/folder/g/h"), type, uuid).isNull());
         QVERIFY(!folderman->checkPathValidityForNewFolder(dirPath + QStringLiteral("/link3/folder/neu_folder"), type, uuid).isNull());
 
         // Subfolder of links
@@ -135,10 +135,10 @@ private Q_SLOTS:
         QVERIFY(!folderman->checkPathValidityForNewFolder({}, type, uuid).isNull());
 
 
-        // REMOVE ownCloud2 from the filesystem, but keep a folder sync'ed to it.
-        QDir(dirPath + QStringLiteral("/ownCloud2/")).removeRecursively();
-        QVERIFY(!folderman->checkPathValidityForNewFolder(dirPath + QStringLiteral("/ownCloud2/blublu"), type, uuid).isNull());
-        QVERIFY(!folderman->checkPathValidityForNewFolder(dirPath + QStringLiteral("/ownCloud2/sub/subsub/sub"), type, uuid).isNull());
+        // REMOVE OpenCloud2 from the filesystem, but keep a folder sync'ed to it.
+        QDir(dirPath + QStringLiteral("/OpenCloud2/")).removeRecursively();
+        QVERIFY(!folderman->checkPathValidityForNewFolder(dirPath + QStringLiteral("/OpenCloud2/blublu"), type, uuid).isNull());
+        QVERIFY(!folderman->checkPathValidityForNewFolder(dirPath + QStringLiteral("/OpenCloud2/sub/subsub/sub"), type, uuid).isNull());
 
         { // check for rejection of a directory with `.sync_*.db`
             QVERIFY(dir2.mkpath(QStringLiteral("db-check1")));
@@ -168,10 +168,10 @@ private Q_SLOTS:
         auto dir = TestUtils::createTempDir();
         QVERIFY(dir.isValid());
         QDir dir2(dir.path());
-        QVERIFY(dir2.mkpath(QStringLiteral("sub/ownCloud1/folder/f")));
-        QVERIFY(dir2.mkpath(QStringLiteral("ownCloud")));
-        QVERIFY(dir2.mkpath(QStringLiteral("ownCloud2")));
-        QVERIFY(dir2.mkpath(QStringLiteral("ownCloud2/foo")));
+        QVERIFY(dir2.mkpath(QStringLiteral("sub/OpenCloud1/folder/f")));
+        QVERIFY(dir2.mkpath(QStringLiteral("OpenCloud")));
+        QVERIFY(dir2.mkpath(QStringLiteral("OpenCloud2")));
+        QVERIFY(dir2.mkpath(QStringLiteral("OpenCloud2/foo")));
         QVERIFY(dir2.mkpath(QStringLiteral("sub/free")));
         QVERIFY(dir2.mkpath(QStringLiteral("free2/sub")));
         QString dirPath = dir2.canonicalPath();
@@ -180,33 +180,33 @@ private Q_SLOTS:
 
         FolderMan *folderman = TestUtils::folderMan();
         QVERIFY(folderman->addFolder(
-            newAccountState.get(), TestUtils::createDummyFolderDefinition(newAccountState->account(), dirPath + QStringLiteral("/sub/ownCloud/"))));
+            newAccountState.get(), TestUtils::createDummyFolderDefinition(newAccountState->account(), dirPath + QStringLiteral("/sub/OpenCloud/"))));
         QVERIFY(folderman->addFolder(
-            newAccountState.get(), TestUtils::createDummyFolderDefinition(newAccountState->account(), dirPath + QStringLiteral("/ownCloud (2)/"))));
+            newAccountState.get(), TestUtils::createDummyFolderDefinition(newAccountState->account(), dirPath + QStringLiteral("/OpenCloud (2)/"))));
 
         // TEST
         const auto folderType = FolderMan::NewFolderType::OC10SyncRoot;
         const auto uuid = QUuid::createUuid();
 
         QCOMPARE(folderman->findGoodPathForNewSyncFolder(dirPath, QStringLiteral("oc"), folderType, uuid), dirPath + QStringLiteral("/oc"));
-        QCOMPARE(folderman->findGoodPathForNewSyncFolder(dirPath, QStringLiteral("ownCloud"), folderType, uuid), dirPath + QStringLiteral("/ownCloud (3)"));
-        QCOMPARE(folderman->findGoodPathForNewSyncFolder(dirPath, QStringLiteral("ownCloud2"), folderType, uuid), dirPath + QStringLiteral("/ownCloud2 (2)"));
+        QCOMPARE(folderman->findGoodPathForNewSyncFolder(dirPath, QStringLiteral("OpenCloud"), folderType, uuid), dirPath + QStringLiteral("/OpenCloud (3)"));
+        QCOMPARE(folderman->findGoodPathForNewSyncFolder(dirPath, QStringLiteral("OpenCloud2"), folderType, uuid), dirPath + QStringLiteral("/OpenCloud2 (2)"));
+        QCOMPARE(folderman->findGoodPathForNewSyncFolder(dirPath, QStringLiteral("OpenCloud (2)"), folderType, uuid),
+            dirPath + QStringLiteral("/OpenCloud (2) (2)"));
         QCOMPARE(
-            folderman->findGoodPathForNewSyncFolder(dirPath, QStringLiteral("ownCloud (2)"), folderType, uuid), dirPath + QStringLiteral("/ownCloud (2) (2)"));
+            folderman->findGoodPathForNewSyncFolder(dirPath, QStringLiteral("OpenCloud2/foo"), folderType, uuid), dirPath + QStringLiteral("/OpenCloud2_foo"));
         QCOMPARE(
-            folderman->findGoodPathForNewSyncFolder(dirPath, QStringLiteral("ownCloud2/foo"), folderType, uuid), dirPath + QStringLiteral("/ownCloud2_foo"));
-        QCOMPARE(
-            folderman->findGoodPathForNewSyncFolder(dirPath, QStringLiteral("ownCloud2/bar"), folderType, uuid), dirPath + QStringLiteral("/ownCloud2_bar"));
+            folderman->findGoodPathForNewSyncFolder(dirPath, QStringLiteral("OpenCloud2/bar"), folderType, uuid), dirPath + QStringLiteral("/OpenCloud2_bar"));
         QCOMPARE(folderman->findGoodPathForNewSyncFolder(dirPath, QStringLiteral("sub"), folderType, uuid), dirPath + QStringLiteral("/sub (2)"));
 
-        // REMOVE ownCloud2 from the filesystem, but keep a folder sync'ed to it.
+        // REMOVE OpenCloud2 from the filesystem, but keep a folder sync'ed to it.
         // We should still not suggest this folder as a new folder.
-        QDir(dirPath + QStringLiteral("/ownCloud (2)/")).removeRecursively();
-        QCOMPARE(folderman->findGoodPathForNewSyncFolder(dirPath, QStringLiteral("ownCloud"), folderType, uuid), dirPath + QStringLiteral("/ownCloud (3)"));
-        QCOMPARE(folderman->findGoodPathForNewSyncFolder(dirPath, QStringLiteral("ownCloud2"), folderType, uuid),
-            QString(dirPath + QStringLiteral("/ownCloud2 (2)")));
-        QCOMPARE(folderman->findGoodPathForNewSyncFolder(dirPath, QStringLiteral("ownCloud (2)"), folderType, uuid),
-            QString(dirPath + QStringLiteral("/ownCloud (2) (2)")));
+        QDir(dirPath + QStringLiteral("/OpenCloud (2)/")).removeRecursively();
+        QCOMPARE(folderman->findGoodPathForNewSyncFolder(dirPath, QStringLiteral("OpenCloud"), folderType, uuid), dirPath + QStringLiteral("/OpenCloud (3)"));
+        QCOMPARE(folderman->findGoodPathForNewSyncFolder(dirPath, QStringLiteral("OpenCloud2"), folderType, uuid),
+            QString(dirPath + QStringLiteral("/OpenCloud2 (2)")));
+        QCOMPARE(folderman->findGoodPathForNewSyncFolder(dirPath, QStringLiteral("OpenCloud (2)"), folderType, uuid),
+            QString(dirPath + QStringLiteral("/OpenCloud (2) (2)")));
 
         // make sure people can't do evil stuff
         QCOMPARE(
diff --git a/test/testfoldermigration.cpp b/test/testfoldermigration.cpp
index 643ca329fa..53ed8441c2 100644
--- a/test/testfoldermigration.cpp
+++ b/test/testfoldermigration.cpp
@@ -23,7 +23,7 @@ auto Settings_2_4()
                           version=2
                           0\Folders\1\localPath=
                           0\Folders\1\journalPath=._sync_2215dfc5505b.db
-                          0\url=https://demo.owncloud.com
+                          0\url=https://demo.opencloud.eu
                           0\Folders\1\targetPath=/
                           0\http_oauth=true
                           0\serverVersion=10.8.0.4
@@ -60,17 +60,17 @@ private Q_SLOTS:
         QTest::addColumn<QStringList>("journalPaths");
         QTest::addColumn<QString>("url");
 
-        QTest::newRow("2.4") << QStringList{QStringLiteral("._sync_2215dfc5505b.db")} << QStringLiteral("https://demo.owncloud.com");
-        QTest::newRow("2.4 url") << QStringList{QStringLiteral("._sync_2215dfc5505b.db")} << QStringLiteral("https://demo.owncloud.com/");
-        QTest::newRow("2.6") << QStringList{QStringLiteral(".sync_2215dfc5505b.db")} << QStringLiteral("https://demo.owncloud.com");
-        QTest::newRow("2.6 url") << QStringList{QStringLiteral(".sync_2215dfc5505b.db")} << QStringLiteral("https://demo.owncloud.com/");
+        QTest::newRow("2.4") << QStringList{QStringLiteral("._sync_2215dfc5505b.db")} << QStringLiteral("https://demo.opencloud.eu");
+        QTest::newRow("2.4 url") << QStringList{QStringLiteral("._sync_2215dfc5505b.db")} << QStringLiteral("https://demo.opencloud.eu/");
+        QTest::newRow("2.6") << QStringList{QStringLiteral(".sync_2215dfc5505b.db")} << QStringLiteral("https://demo.opencloud.eu");
+        QTest::newRow("2.6 url") << QStringList{QStringLiteral(".sync_2215dfc5505b.db")} << QStringLiteral("https://demo.opencloud.eu/");
         QTest::newRow("2.6 multi") << QStringList{QStringLiteral(".sync_2215dfc5505b.db"), QStringLiteral("._sync_2215dfc5505b.db")}
-                                   << QStringLiteral("https://demo.owncloud.com");
-        QTest::newRow("2.9") << QStringList{QStringLiteral(".sync_journal.db")} << QStringLiteral("https://demo.owncloud.com");
-        QTest::newRow("2.9 url") << QStringList{QStringLiteral(".sync_journal.db")} << QStringLiteral("https://demo.owncloud.com/");
+                                   << QStringLiteral("https://demo.opencloud.eu");
+        QTest::newRow("2.9") << QStringList{QStringLiteral(".sync_journal.db")} << QStringLiteral("https://demo.opencloud.eu");
+        QTest::newRow("2.9 url") << QStringList{QStringLiteral(".sync_journal.db")} << QStringLiteral("https://demo.opencloud.eu/");
         QTest::newRow("2.9 multi") << QStringList{QStringLiteral(".sync_journal.db"), QStringLiteral(".sync_2215dfc5505b.db"),
             QStringLiteral("._sync_2215dfc5505b.db")}
-                                   << "https://demo.owncloud.com";
+                                   << "https://demo.opencloud.eu";
     }
 
     void testFolderMigrationMissingJournalPath()
diff --git a/test/testlockedfiles.cpp b/test/testlockedfiles.cpp
index b1650c5e06..e81eba4907 100644
--- a/test/testlockedfiles.cpp
+++ b/test/testlockedfiles.cpp
@@ -73,7 +73,7 @@ private Q_SLOTS:
             QVERIFY(QFileInfo(tmpFile).dir().mkpath(QStringLiteral(".")));
             QFile tmp(tmpFile);
             QVERIFY(tmp.open(QFile::WriteOnly));
-            QVERIFY(tmp.write("ownCLoud"));
+            QVERIFY(tmp.write("OpenCloud"));
         }
         QVERIFY(QFile::exists(tmpFile));
 
diff --git a/test/testoauth.cpp b/test/testoauth.cpp
index 523a6058fb..56714e60e6 100644
--- a/test/testoauth.cpp
+++ b/test/testoauth.cpp
@@ -27,7 +27,7 @@ class DesktopServiceHook : public QObject
     ~DesktopServiceHook() { QDesktopServices::unsetUrlHandler(QStringLiteral("oauthtest")); }
 };
 
-static const QUrl sOAuthTestServer(QStringLiteral("oauthtest://someserver/owncloud"));
+static const QUrl sOAuthTestServer(QStringLiteral("oauthtest://someserver/opencloud"));
 
 
 class FakePostReply : public QNetworkReply
@@ -192,7 +192,7 @@ class OAuthTestCase : public QObject
         QCOMPARE(state, UserInfoFetched);
         browserReply->deleteLater();
         QCOMPARE(QNetworkReply::NoError, browserReply->error());
-        QCOMPARE(browserReply->rawHeader("Location"), QByteArray("owncloud://success"));
+        QCOMPARE(browserReply->rawHeader("Location"), QByteArray("opencloud://success"));
         replyToBrowserOk = true;
     }
 
@@ -246,7 +246,7 @@ class OAuthTestCase : public QObject
     virtual QByteArray tokenReplyPayload() const {
         // the dummy server provides the user admin
         QJsonDocument jsondata(QJsonObject{{QStringLiteral("access_token"), QStringLiteral("123")}, {QStringLiteral("refresh_token"), QStringLiteral("456")},
-            {QStringLiteral("message_url"), QStringLiteral("owncloud://success")}, {QStringLiteral("user_id"), QStringLiteral("admin")},
+            {QStringLiteral("message_url"), QStringLiteral("opencloud://success")}, {QStringLiteral("user_id"), QStringLiteral("admin")},
             {QStringLiteral("token_type"), QStringLiteral("Bearer")}});
         return jsondata.toJson();
     }
@@ -256,7 +256,7 @@ class OAuthTestCase : public QObject
         QJsonDocument jsondata(
             QJsonObject{{QStringLiteral("installed"), true}, {QStringLiteral("maintenance"), false}, {QStringLiteral("needsDbUpgrade"), false},
                 {QStringLiteral("version"), QStringLiteral("10.5.0.10")}, {QStringLiteral("versionstring"), QStringLiteral("10.5.0")},
-                {QStringLiteral("edition"), QStringLiteral("Enterprise")}, {QStringLiteral("productname"), QStringLiteral("ownCloud")}});
+                {QStringLiteral("edition"), QStringLiteral("Enterprise")}, {QStringLiteral("productname"), QStringLiteral("OpenCloud")}});
         return jsondata.toJson();
     }
 
@@ -303,7 +303,7 @@ private Q_SLOTS:
             QByteArray tokenReplyPayload() const override {
                 // the dummy server provides the user admin
                 QJsonDocument jsondata(QJsonObject{{QStringLiteral("access_token"), QStringLiteral("123")},
-                    {QStringLiteral("refresh_token"), QStringLiteral("456")}, {QStringLiteral("message_url"), QStringLiteral("owncloud://success")},
+                    {QStringLiteral("refresh_token"), QStringLiteral("456")}, {QStringLiteral("message_url"), QStringLiteral("OpenCloud://success")},
                     {QStringLiteral("user_id"), QStringLiteral("wrong_user")}, {QStringLiteral("token_type"), QStringLiteral("Bearer")}});
                 return jsondata.toJson();
             }
@@ -617,7 +617,21 @@ private Q_SLOTS:
 
             QNetworkReply *clientRegistrationReply(QNetworkAccessManager::Operation op, const QNetworkRequest &request) override
             {
-                const QByteArray payload(QByteArrayLiteral("{\"redirect_uris\":[\"http://127.0.0.1\"],\"token_endpoint_auth_method\":\"client_secret_basic\",\"grant_types\":[\"authorization_code\",\"refresh_token\"],\"response_types\":[\"code\",\"none\"],\"client_id\":\"3e4ea0f3-59ea-434a-92f2-b0d3b54443e9\",\"client_secret\":\"rmoEXFc1Z5tGTApxanBW7STlWODqRTYx\",\"client_name\":\"ownCloud 3.0.0.0\",\"scope\":\"web-origins address phone offline_access microprofile-jwt\",\"subject_type\":\"public\",\"request_uris\":[],\"tls_client_certificate_bound_access_tokens\":false,\"client_id_issued_at\":1663074650,\"client_secret_expires_at\":0,\"registration_client_uri\":\"https://someserver.de/auth/realms/ocis/clients-registrations/openid-connect/3e4ea0f3-59ea-434a-92f2-b0d3b54443e9\",\"registration_access_token\":\"eyJhbGciOiJIUzI1NiIsInR5cCIgOiAiSldUIiwia2lkIiA6ICIzYjQ2YWVkYi00Y2I3LTRiMGItODA5Ny1lNjRmOGQ5ZWY2YjQifQ.eyJleHAiOjAsImlhdCI6MTY2MzA3NDY1MCwianRpIjoiNTlkZWIzNTktNTBmZS00YTUyLWFmNTItZjFjNDg3ZTFlOWRmIiwiaXNzIjoiaHR0cHM6Ly9rZXljbG9hay5vd25jbG91ZC5jbG91ZHNwZWljaGVyLWJheWVybi5kZS9hdXRoL3JlYWxtcy9vY2lzIiwiYXVkIjoiaHR0cHM6Ly9rZXljbG9hay5vd25jbG91ZC5jbG91ZHNwZWljaGVyLWJheWVybi5kZS9hdXRoL3JlYWxtcy9vY2lzIiwidHlwIjoiUmVnaXN0cmF0aW9uQWNjZXNzVG9rZW4iLCJyZWdpc3RyYXRpb25fYXV0aCI6ImFub255bW91cyJ9.v1giSvpnKw1hTtBYZaqdp3JqnZ5mvCKYhQDKkT7x8Us\",\"backchannel_logout_session_required\":false,\"require_pushed_authorization_requests\":false}"));
+                const QByteArray payload(QByteArrayLiteral(
+                    "{\"redirect_uris\":[\"http://"
+                    "127.0.0.1\"],\"token_endpoint_auth_method\":\"client_secret_basic\",\"grant_types\":[\"authorization_code\",\"refresh_token\"],\"response_"
+                    "types\":[\"code\",\"none\"],\"client_id\":\"3e4ea0f3-59ea-434a-92f2-b0d3b54443e9\",\"client_secret\":\"rmoEXFc1Z5tGTApxanBW7STlWODqRTYx\","
+                    "\"client_name\":\"OpenCloud 3.0.0.0\",\"scope\":\"web-origins address phone offline_access "
+                    "microprofile-jwt\",\"subject_type\":\"public\",\"request_uris\":[],\"tls_client_certificate_bound_access_tokens\":false,\"client_id_"
+                    "issued_at\":1663074650,\"client_secret_expires_at\":0,\"registration_client_uri\":\"https://someserver.de/auth/realms/ocis/"
+                    "clients-registrations/openid-connect/"
+                    "3e4ea0f3-59ea-434a-92f2-b0d3b54443e9\",\"registration_access_token\":"
+                    "\"eyJhbGciOiJIUzI1NiIsInR5cCIgOiAiSldUIiwia2lkIiA6ICIzYjQ2YWVkYi00Y2I3LTRiMGItODA5Ny1lNjRmOGQ5ZWY2YjQifQ."
+                    "eyJleHAiOjAsImlhdCI6MTY2MzA3NDY1MCwianRpIjoiNTlkZWIzNTktNTBmZS00YTUyLWFmNTItZjFjNDg3ZTFlOWRmIiwiaXNzIjoiaHR0cHM6Ly9rZXljbG9hay5vd25jbG91ZC"
+                    "5jbG91ZHNwZWljaGVyLWJheWVybi5kZS9hdXRoL3JlYWxtcy9vY2lzIiwiYXVkIjoiaHR0cHM6Ly9rZXljbG9hay5vd25jbG91ZC5jbG91ZHNwZWljaGVyLWJheWVybi5kZS9hdXRo"
+                    "L3JlYWxtcy9vY2lzIiwidHlwIjoiUmVnaXN0cmF0aW9uQWNjZXNzVG9rZW4iLCJyZWdpc3RyYXRpb25fYXV0aCI6ImFub255bW91cyJ9."
+                    "v1giSvpnKw1hTtBYZaqdp3JqnZ5mvCKYhQDKkT7x8Us\",\"backchannel_logout_session_required\":false,\"require_pushed_authorization_requests\":"
+                    "false}"));
 
                 auto *out = new FakePayloadReply(op, request, payload, fakeAm);
                 out->setAttribute(QNetworkRequest::HttpStatusCodeAttribute, 201);
@@ -682,7 +696,7 @@ private Q_SLOTS:
                                                            "127.0.0.1\"],\"token_endpoint_auth_method\":\"client_secret_basic\",\"grant_types\":["
                                                            "\"authorization_code\",\"refresh_token\"],\"response_types\":[\"code\",\"none\"],\"client_id\":\"")
                     + _expectedClientId.toUtf8() + QByteArrayLiteral("\",\"client_secret\":\"") + _expectedClientSecret.toUtf8()
-                    + QByteArrayLiteral("\",\"client_name\":\"ownCloud 3.0.0.0\",\"scope\":\"web-origins address phone offline_access "
+                    + QByteArrayLiteral("\",\"client_name\":\"OpenCloud 3.0.0.0\",\"scope\":\"web-origins address phone offline_access "
                                         "microprofile-jwt\",\"subject_type\":\"public\",\"request_uris\":[],\"tls_client_certificate_bound_access_tokens\":"
                                         "false,\"client_id_issued_at\":1663074650,\"client_secret_expires_at\":0,\"registration_client_uri\":\"https://"
                                         "someserver.de/auth/realms/ocis/clients-registrations/openid-connect/"
diff --git a/test/testowncloudpropagator.cpp b/test/testowncloudpropagator.cpp
index 6e1be209ae..d67f564748 100644
--- a/test/testowncloudpropagator.cpp
+++ b/test/testowncloudpropagator.cpp
@@ -41,7 +41,7 @@ private Q_SLOTS:
             QVERIFY( tmpFileName.length() <= 254);
         }
         // with absolute dir
-        fn = QStringLiteral("/Users/guruz/ownCloud/rocks/GPL");
+        fn = QStringLiteral("/Users/guruz/OpenCloud/rocks/GPL");
         for (int i = 1; i < 1000; i++) {
             fn += QLatin1Char('F');
             QString tmpFileName = createDownloadTmpFileName(fn);
diff --git a/test/testspacesmigration/drivespayload.json b/test/testspacesmigration/drivespayload.json
index a101890248..c8ecd937e7 100644
--- a/test/testspacesmigration/drivespayload.json
+++ b/test/testspacesmigration/drivespayload.json
@@ -19,7 +19,7 @@
             "root": {
                 "eTag": "\"997dd59b42bb42b90c822362f441c88d\"",
                 "id": "1284d238-aa92-42ce-bdc4-0b0000009157$534bb038-6f9d-4093-946f-133be61fa4e7",
-                "webDavUrl": "https://ocis.owncloud.test/dav/spaces/1284d238-aa92-42ce-bdc4-0b0000009157$534bb038-6f9d-4093-946f-133be61fa4e7"
+                "webDavUrl": "https://demo.opencloud.eu/dav/spaces/1284d238-aa92-42ce-bdc4-0b0000009157$534bb038-6f9d-4093-946f-133be61fa4e7"
             }
         },
         {
@@ -61,7 +61,7 @@
                         ]
                     }
                 ],
-                "webDavUrl": "https://ocis.owncloud.test/dav/spaces/1284d238-aa92-42ce-bdc4-0b0000009157$31f599a1-94e1-4dfb-8bc9-841a57066d05"
+                "webDavUrl": "https://demo.opencloud.eu/dav/spaces/1284d238-aa92-42ce-bdc4-0b0000009157$31f599a1-94e1-4dfb-8bc9-841a57066d05"
             },
             "special": [
                 {
@@ -77,7 +77,7 @@
                         "name": "image"
                     },
                     "webDavUrl":
-                        "https://ocis.owncloud.test/dav/spaces/1284d238-aa92-42ce-bdc4-0b0000009157$31f599a1-94e1-4dfb-8bc9-841a57066d05%2131f599a1-94e1-4dfb-8bc9-841a57066d05/.space/mind-blow-galaxy.gif"
+                        "https://demo.opencloud.eu/dav/spaces/1284d238-aa92-42ce-bdc4-0b0000009157$31f599a1-94e1-4dfb-8bc9-841a57066d05%2131f599a1-94e1-4dfb-8bc9-841a57066d05/.space/mind-blow-galaxy.gif"
                 },
                 {
                     "eTag": "\"c70081a95ad0938009aea08a45ab458f\"",
@@ -92,7 +92,7 @@
                         "name": "readme"
                     },
                     "webDavUrl":
-                        "https://ocis.owncloud.test/dav/spaces/1284d238-aa92-42ce-bdc4-0b0000009157$31f599a1-94e1-4dfb-8bc9-841a57066d05%2131f599a1-94e1-4dfb-8bc9-841a57066d05/.space/readme.md"
+                        "https://demo.opencloud.eu/dav/spaces/1284d238-aa92-42ce-bdc4-0b0000009157$31f599a1-94e1-4dfb-8bc9-841a57066d05%2131f599a1-94e1-4dfb-8bc9-841a57066d05/.space/readme.md"
                 }
             ]
         },
@@ -110,7 +110,7 @@
             "root": {
                 "eTag": "\"d1a362a801c8821c9c3074385c2a7d44\"",
                 "id": "a0ca6a90-a365-4782-871e-d44447bbc668$a0ca6a90-a365-4782-871e-d44447bbc668",
-                "webDavUrl": "https://ocis.owncloud.test/dav/spaces/a0ca6a90-a365-4782-871e-d44447bbc668$a0ca6a90-a365-4782-871e-d44447bbc668"
+                "webDavUrl": "https://demo.opencloud.eu/dav/spaces/a0ca6a90-a365-4782-871e-d44447bbc668$a0ca6a90-a365-4782-871e-d44447bbc668"
             }
         },
         {
@@ -138,10 +138,10 @@
                     "name": "New folder",
                     "size": 45204672,
                     "webDavUrl":
-                        "https://ocis.owncloud.test/dav/spaces/1284d238-aa92-42ce-bdc4-0b0000009157$4c510ada-c86b-4815-8820-42cdf82c3d51%21b58e4a22-6395-45f9-89a2-4233ba16d2fe"
+                        "https://demo.opencloud.eu/dav/spaces/1284d238-aa92-42ce-bdc4-0b0000009157$4c510ada-c86b-4815-8820-42cdf82c3d51%21b58e4a22-6395-45f9-89a2-4233ba16d2fe"
                 },
                 "webDavUrl":
-                    "https://ocis.owncloud.test/dav/spaces/a0ca6a90-a365-4782-871e-d44447bbc668$a0ca6a90-a365-4782-871e-d44447bbc668%2148224266-d46b-4c3c-8ab4-d4334c3020dc"
+                    "https://demo.opencloud.eu/dav/spaces/a0ca6a90-a365-4782-871e-d44447bbc668$a0ca6a90-a365-4782-871e-d44447bbc668%2148224266-d46b-4c3c-8ab4-d4334c3020dc"
             }
         }
     ]
diff --git a/test/testspacesmigration/testspacesmigration.cpp b/test/testspacesmigration/testspacesmigration.cpp
index 6bf15d3830..4ee8499807 100644
--- a/test/testspacesmigration/testspacesmigration.cpp
+++ b/test/testspacesmigration/testspacesmigration.cpp
@@ -56,7 +56,7 @@ private Q_SLOTS:
 
 
         const QUrl personalUrl(
-            QStringLiteral("https://ocis.owncloud.test/dav/spaces/1284d238-aa92-42ce-bdc4-0b0000009157$534bb038-6f9d-4093-946f-133be61fa4e7"));
+            QStringLiteral("https://demo.opencloud.eu/dav/spaces/1284d238-aa92-42ce-bdc4-0b0000009157$534bb038-6f9d-4093-946f-133be61fa4e7"));
         QByteArray folder1Uuid;
         auto newAccountState = AccountState::fromNewAccount(fakeFolder.account());
         {
@@ -82,7 +82,7 @@ private Q_SLOTS:
             QCOMPARE(folder2->remotePath(), QStringLiteral("/Documents"));
 
             QCOMPARE(folder3->webDavUrl(),
-                QUrl(QStringLiteral("https://ocis.owncloud.test/dav/spaces/1284d238-aa92-42ce-bdc4-0b0000009157$31f599a1-94e1-4dfb-8bc9-841a57066d05")));
+                QUrl(QStringLiteral("https://demo.opencloud.eu/dav/spaces/1284d238-aa92-42ce-bdc4-0b0000009157$31f599a1-94e1-4dfb-8bc9-841a57066d05")));
             QCOMPARE(folder3->remotePath(), QStringLiteral("/"));
 
             // The shares folder was not migrated
diff --git a/test/testupdater.cpp b/test/testupdater.cpp
index 29e7078636..c0783c937b 100644
--- a/test/testupdater.cpp
+++ b/test/testupdater.cpp
@@ -21,7 +21,7 @@ private Q_SLOTS:
         QTest::addColumn<QString>("url");
         QTest::addColumn<OCUpdater::DownloadState>("result");
         // a redirect to attic
-        QTest::newRow("redirect") << "https://download.owncloud.com/desktop/stable/ownCloud-2.2.4.6408-setup.exe" << OCUpdater::DownloadComplete;
+        QTest::newRow("redirect") << "https://download.opencloud.eu/desktop/stable/ownCloud-2.2.4.6408-setup.exe" << OCUpdater::DownloadComplete;
         QTest::newRow("broken url") << "https://&" << OCUpdater::DownloadFailed;
     }
 
@@ -31,7 +31,7 @@ private Q_SLOTS:
         QFETCH(OCUpdater::DownloadState, result);
         UpdateInfo info;
         info.setDownloadUrl(url);
-        info.setVersionString(QStringLiteral("ownCloud 2.2.4 (build 6408)"));
+        info.setVersionString(QStringLiteral("OpenCloud 2.2.4 (build 6408)"));
         // esnure we do the update
         info.setVersion(QStringLiteral("100.2.4.6408"));
         auto *updater = new WindowsUpdater({});
diff --git a/test/testutils/testutils.cpp b/test/testutils/testutils.cpp
index ff45b06966..009e8c5036 100644
--- a/test/testutils/testutils.cpp
+++ b/test/testutils/testutils.cpp
@@ -50,7 +50,7 @@ namespace TestUtils {
 
     QTemporaryDir createTempDir()
     {
-        return QTemporaryDir { QStringLiteral("%1/ownCloud-unit-test-%2-XXXXXX").arg(QDir::tempPath(), qApp->applicationName()) };
+        return QTemporaryDir{QStringLiteral("%1/OpenCloud-unit-test-%2-XXXXXX").arg(QDir::tempPath(), qApp->applicationName())};
     }
 
     FolderMan *folderMan()