diff --git a/CHANGELOG.md b/CHANGELOG.md
index acf64baab31..29ad47c93a2 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -526,15 +526,15 @@ ownCloud admins and users.
 
 ## Summary
 
-* Bugfix - Fix url resolution for app provider: [#11296](https://github.com/owncloud/client/issues/11296)
+* Bugfix - Fix URL resolution for app provider: [#11296](https://github.com/owncloud/client/issues/11296)
 * Bugfix - Fix crash on unhandled status code on rename check: [#11379](https://github.com/owncloud/client/issues/11379)
 
 ## Details
 
-* Bugfix - Fix url resolution for app provider: [#11296](https://github.com/owncloud/client/issues/11296)
+* Bugfix - Fix URL resolution for app provider: [#11296](https://github.com/owncloud/client/issues/11296)
 
-   We fixed a bug in the url resolution for the app provider. If owncloud is
-   installed to a non-root directory we computed a wrong url for the app provider
+   We fixed a bug in the URL resolution for the app provider. If owncloud is
+   installed to a non-root directory we computed a wrong URL for the app provider
    urls. This could trigger a connection validation in the client, which intern
    triggered a request to the app provider. Resulting in an endless loop rendering
    the client unusable.
@@ -983,7 +983,7 @@ ownCloud admins and users.
 
 * Bugfix - Wrong davUser in cmd client: [#10946](https://github.com/owncloud/client/issues/10946)
 
-   We fixed a bug where the wrong dav user was used in the url, when the username
+   We fixed a bug where the wrong dav user was used in the URL, when the username
    from the credentials differed from the username used on the server.
 
    https://github.com/owncloud/client/issues/10946
@@ -1015,8 +1015,8 @@ ownCloud admins and users.
 * Bugfix - Follow same site redirects in the Wizard: [#5743](https://github.com/owncloud/enterprise/issues/5743)
 
    We fixed a bug where the client did not follow same site redirects during the
-   setup. If the used url https://test.com/owncloud redirected to https://test.com
-   the new url was not correctly used for the newly created account.
+   setup. If the used URL https://test.com/owncloud redirected to https://test.com
+   the new URL was not correctly used for the newly created account.
 
    https://github.com/owncloud/enterprise/issues/5743
 
@@ -1080,7 +1080,7 @@ ownCloud admins and users.
 * Enhancement - Disable DPI scaling factor rounding on Windows: [#10406](https://github.com/owncloud/client/issues/10406)
 * Enhancement - Display quota for Spaces: [#10453](https://github.com/owncloud/client/issues/10453)
 * Enhancement - New WebFinger workflow: [#10517](https://github.com/owncloud/client/issues/10517)
-* Enhancement - Branding: Allow the addition of buttons to open an url: [#10518](https://github.com/owncloud/client/issues/10518)
+* Enhancement - Branding: Allow the addition of buttons to open a URL: [#10518](https://github.com/owncloud/client/issues/10518)
 * Enhancement - Build the client without the auto updater by default: [#10537](https://github.com/owncloud/client/issues/10537)
 * Enhancement - Improve presentation of connection state: [#10557](https://github.com/owncloud/client/issues/10557)
 * Enhancement - Display open in web in file browser context menu, on sync roots: [#10572](https://github.com/owncloud/client/issues/10572)
@@ -1247,7 +1247,7 @@ ownCloud admins and users.
    https://github.com/owncloud/client/pull/10665
    https://owncloud.dev/services/webfinger/
 
-* Enhancement - Branding: Allow the addition of buttons to open an url: [#10518](https://github.com/owncloud/client/issues/10518)
+* Enhancement - Branding: Allow the addition of buttons to open a URL: [#10518](https://github.com/owncloud/client/issues/10518)
 
    We added a branding option that allows to add buttons to the toolbar. Those
    buttons will then open a hardcoded web page.
@@ -1290,7 +1290,7 @@ ownCloud admins and users.
 
 * Enhancement - Always point to the latest documentation: [#10634](https://github.com/owncloud/client/issues/10634)
 
-   We used an url for the documentation that contained the client version. While
+   We used a URL for the documentation that contained the client version. While
    this ensured a used would get the documentation matching to their client, this
    only worked with the last two released clients. So users of a pre-release or of
    a very old client where served a 404.
@@ -1480,7 +1480,7 @@ ownCloud admins and users.
 * Bugfix - Properly resume upload with a partial local discovery: [#5382](https://github.com/owncloud/enterprise/issues/5382)
 * Bugfix - Add request time and other missing data to .owncloudsync.log: [#7348](https://github.com/owncloud/client/issues/7348)
 * Bugfix - Don't display a context-menu on the root folder: [#8595](https://github.com/owncloud/client/issues/8595)
-* Bugfix - Fix copy url location for private links: [#9048](https://github.com/owncloud/client/issues/9048)
+* Bugfix - Fix copy URL location for private links: [#9048](https://github.com/owncloud/client/issues/9048)
 * Bugfix - Fix status of files uploaded with TUS: [#9472](https://github.com/owncloud/client/pull/9472)
 * Bugfix - Don't unset implicit log flush: [#9515](https://github.com/owncloud/client/pull/9515)
 * Bugfix - The condition for the read only files menu was inverted: [#9574](https://github.com/owncloud/client/issues/9574)
@@ -1556,10 +1556,10 @@ ownCloud admins and users.
 
    https://github.com/owncloud/client/issues/8595
 
-* Bugfix - Fix copy url location for private links: [#9048](https://github.com/owncloud/client/issues/9048)
+* Bugfix - Fix copy URL location for private links: [#9048](https://github.com/owncloud/client/issues/9048)
 
    We fixed a bug where a placeholder was copied to the clipboard instead of the
-   url.
+   URL.
 
    https://github.com/owncloud/client/issues/9048
 
@@ -1697,7 +1697,7 @@ ownCloud admins and users.
 * Change - Don't guess remote folder in owncloudcmd: [#10193](https://github.com/owncloud/client/issues/10193)
 
    The commandline client was modified to explicitly accept remote folder, the
-   remote folder must no longer be encoded in the server url.
+   remote folder must no longer be encoded in the server URL.
 
    https://github.com/owncloud/client/issues/10193
 
@@ -1711,8 +1711,8 @@ ownCloud admins and users.
 * Change - Owncloudcmd oCIS support: [#10239](https://github.com/owncloud/client/pull/10239)
 
    When using oCIS and spaces with the cmd client the additional parameter
-   `--server` is required. `--server` specifies the url to the server, while the
-   positional parameter 'server_url' specifies the webdav url.
+   `--server` is required. `--server` specifies the URL to the server, while the
+   positional parameter 'server_url' specifies the webdav URL.
 
    https://github.com/owncloud/client/pull/10239
 
@@ -2470,7 +2470,7 @@ ownCloud admins and users.
 
 * Enhancement - Also ignore local repeating errors for a period of time: [#9208](https://github.com/owncloud/client/issues/9208)
 
-   If an error occurs on the server (an url is not reachable) we try a couple of
+   If an error occurs on the server (a URL is not reachable) we try a couple of
    times, then we ignore that file for a period of time. We now do the same with
    errors that occur locally.
 
@@ -2495,7 +2495,7 @@ ownCloud admins and users.
 
 * Bugfix - Properly handle Windows log off: [#8979](https://github.com/owncloud/client/issues/8979)
 * Bugfix - Disable vfs option is ignored: [#9159](https://github.com/owncloud/client/issues/9159)
-* Bugfix - The client no longer idles after a minor url change: [#9202](https://github.com/owncloud/client/pull/9202)
+* Bugfix - The client no longer idles after a minor URL change: [#9202](https://github.com/owncloud/client/pull/9202)
 * Bugfix - Config migration on systems with a 2.4 and a 2.8 config: [#9224](https://github.com/owncloud/client/issues/9224)
 * Enhancement - Add branding option to disable icons in the file explorer: [#9167](https://github.com/owncloud/client/issues/9167)
 * Enhancement - Branding option to disable warning for multiple sync_journal.db's: [#9216](https://github.com/owncloud/client/pull/9216)
@@ -2519,12 +2519,12 @@ ownCloud admins and users.
    https://github.com/owncloud/client/issues/9159
    https://github.com/owncloud/enterprise/issues/4820
 
-* Bugfix - The client no longer idles after a minor url change: [#9202](https://github.com/owncloud/client/pull/9202)
+* Bugfix - The client no longer idles after a minor URL change: [#9202](https://github.com/owncloud/client/pull/9202)
 
-   When the client detects a change of the url we ask the user to accept the change
+   When the client detects a change of the URL we ask the user to accept the change
    or if it was only representational change (demo.com vs demo.com/) we directly
    accept the change. Due to a bug we aborted the sync only after we updated the
-   url. This caused the client to idle for one minute.
+   URL. This caused the client to idle for one minute.
 
    https://github.com/owncloud/client/pull/9202
 
@@ -2564,7 +2564,7 @@ ownCloud admins and users.
 
 * Bugfix - Mac multiple dialogs block all input: [#8421](https://github.com/owncloud/client/issues/8421)
 * Bugfix - Enforce rtl layout with rtl languages: [#8806](https://github.com/owncloud/client/issues/8806)
-* Bugfix - Broken url in branded builds: [#8920](https://github.com/owncloud/client/issues/8920)
+* Bugfix - Broken URL in branded builds: [#8920](https://github.com/owncloud/client/issues/8920)
 * Bugfix - Handle use of directory of another Windows VFS sync client: [#8994](https://github.com/owncloud/client/issues/8994)
 * Bugfix - Building libcloudprovider support fails: [#8996](https://github.com/owncloud/client/issues/8996)
 * Bugfix - Tables now display local time: [#9006](https://github.com/owncloud/client/issues/9006)
@@ -2598,7 +2598,7 @@ ownCloud admins and users.
    https://github.com/owncloud/client/issues/8806
    https://github.com/owncloud/client/pull/8981
 
-* Bugfix - Broken url in branded builds: [#8920](https://github.com/owncloud/client/issues/8920)
+* Bugfix - Broken URL in branded builds: [#8920](https://github.com/owncloud/client/issues/8920)
 
    We fixed a string issue with branded builds resulting in invalid urls.
 
@@ -2755,7 +2755,7 @@ ownCloud admins and users.
 * Change - We removed the support for async jobs using OC-JobStatus-Location: [#8398](https://github.com/owncloud/client/pull/8398)
 * Change - Add a branding option to skip the advanced setup page: [#8665](https://github.com/owncloud/client/issues/8665)
 * Enhancement - Make crash report IDs easy to copy: [#25](https://github.com/dschmidt/libcrashreporter-qt/pull/25)
-* Enhancement - Prefer 127.0.0.1 as oauth redirect url: [#4542](https://github.com/owncloud/enterprise/issues/4542)
+* Enhancement - Prefer 127.0.0.1 as oauth redirect URL: [#4542](https://github.com/owncloud/enterprise/issues/4542)
 * Enhancement - Display an icon in the Windows explorer context menu: [#4627](https://github.com/owncloud/client/issues/4627)
 * Enhancement - Show last sync date in tray menu: [#5644](https://github.com/owncloud/client/issues/5644)
 * Enhancement - Consider a remote poll interval coming with the server capabilities: [#5947](https://github.com/owncloud/client/issues/5947)
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 0ac9bd7cb33..7e633f172f2 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -98,7 +98,7 @@ option(FORCE_ASSERTS "FORCE_ASSERTS" OFF)
 option(WITH_APPIMAGEUPDATER OFF "Enable built-in libappimageupdate based updater on Linux")
 add_feature_info(AppImageUpdate WITH_APPIMAGEUPDATER "Built-in libappimageupdate based updater")
 
-option(WITH_EXTERNAL_BRANDING "An URL to an external branding repo" "")
+option(WITH_EXTERNAL_BRANDING "A URL to an external branding repo" "")
 
 # specify additional vfs plugins
 set(VIRTUAL_FILE_SYSTEM_PLUGINS off suffix win CACHE STRING "Name of internal plugin in src/libsync/vfs or the locations of virtual file plugins")
diff --git a/changelog/2.10.0_2022-01-17/9208.md b/changelog/2.10.0_2022-01-17/9208.md
index 4d80a9b7aec..c6db7aa811b 100644
--- a/changelog/2.10.0_2022-01-17/9208.md
+++ b/changelog/2.10.0_2022-01-17/9208.md
@@ -1,6 +1,6 @@
 Enhancement: Also ignore local repeating errors for a period of time
 
-If an error occurs on the server (an url is not reachable) we try a couple of times, then we ignore that file for a period of time.
+If an error occurs on the server (a URL is not reachable) we try a couple of times, then we ignore that file for a period of time.
 We now do the same with errors that occur locally.
 
 https://github.com/owncloud/client/issues/9208
diff --git a/changelog/2.9.0_2021-09-08/4542.md b/changelog/2.9.0_2021-09-08/4542.md
index dc52c48247a..fff2e746b34 100644
--- a/changelog/2.9.0_2021-09-08/4542.md
+++ b/changelog/2.9.0_2021-09-08/4542.md
@@ -1,7 +1,7 @@
-Enhancement: Prefer 127.0.0.1 as oauth redirect url
+Enhancement: Prefer 127.0.0.1 as oauth redirect URL
 
 When using OpenID Connect we now always use http://127.0.0.1
-as redirect url instead of http://localhost, following the recommendations in RFC 8252   (https://tools.ietf.org/html/rfc8252).
+as redirect URL instead of http://localhost, following the recommendations in RFC 8252   (https://tools.ietf.org/html/rfc8252).
 For OAuth2 we added a branding parameter which allows to specify http://127.0.0.1 instead
 of http://localhost.
 
diff --git a/changelog/2.9.0_2021-09-08/8231.md b/changelog/2.9.0_2021-09-08/8231.md
index 44b4c198f9f..1eb97f3c2eb 100644
--- a/changelog/2.9.0_2021-09-08/8231.md
+++ b/changelog/2.9.0_2021-09-08/8231.md
@@ -1,6 +1,6 @@
 Change: Don't ask the user to switch to http
 
-We no longer recommend to use a http connection if a https url
+We no longer recommend to use a http connection if a https URL
 was not found.
 
 https://github.com/owncloud/client/issues/8231
diff --git a/changelog/2.9.1_2021-10-13/8920.md b/changelog/2.9.1_2021-10-13/8920.md
index e5a2519046d..ca66797ecbf 100644
--- a/changelog/2.9.1_2021-10-13/8920.md
+++ b/changelog/2.9.1_2021-10-13/8920.md
@@ -1,4 +1,4 @@
-Bugfix: Broken url in branded builds
+Bugfix: Broken URL in branded builds
 
 We fixed a string issue with branded builds resulting in invalid urls.
 
diff --git a/changelog/2.9.2_2021-11-24/9202.md b/changelog/2.9.2_2021-11-24/9202.md
index 802a217aafa..e402a4ea69d 100644
--- a/changelog/2.9.2_2021-11-24/9202.md
+++ b/changelog/2.9.2_2021-11-24/9202.md
@@ -1,8 +1,8 @@
-Bugfix: The client no longer idles after a minor url change
+Bugfix: The client no longer idles after a minor URL change
 
-When the client detects a change of the url we ask the user to accept
+When the client detects a change of the URL we ask the user to accept
 the change or if it was only representational change (demo.com vs demo.com/) we directly accept the change.
-Due to a bug we aborted the sync only after we updated the url.
+Due to a bug we aborted the sync only after we updated the URL.
 This caused the client to idle for one minute.
 
 https://github.com/owncloud/client/pull/9202
diff --git a/changelog/3.0.0_2022-11-30/10193.md b/changelog/3.0.0_2022-11-30/10193.md
index 45d71398230..5021e9b5a20 100644
--- a/changelog/3.0.0_2022-11-30/10193.md
+++ b/changelog/3.0.0_2022-11-30/10193.md
@@ -1,5 +1,5 @@
 Change: Don't guess remote folder in owncloudcmd
 
-The commandline client was modified to explicitly accept remote folder, the remote folder must no longer be encoded in the server url.
+The commandline client was modified to explicitly accept remote folder, the remote folder must no longer be encoded in the server URL.
 
 https://github.com/owncloud/client/issues/10193
diff --git a/changelog/3.0.0_2022-11-30/10239.md b/changelog/3.0.0_2022-11-30/10239.md
index cad0e472eac..7f4534f278f 100644
--- a/changelog/3.0.0_2022-11-30/10239.md
+++ b/changelog/3.0.0_2022-11-30/10239.md
@@ -1,6 +1,6 @@
 Change: owncloudcmd oCIS support
 
 When using oCIS and spaces with the cmd client the additional parameter `--server` is required.
-`--server` specifies the url to the server, while the positional parameter 'server_url' specifies the webdav url.
+`--server` specifies the URL to the server, while the positional parameter 'server_url' specifies the webdav URL.
 
 https://github.com/owncloud/client/pull/10239
diff --git a/changelog/3.0.0_2022-11-30/9048.md b/changelog/3.0.0_2022-11-30/9048.md
index aa1f152aad0..67a28daf41f 100644
--- a/changelog/3.0.0_2022-11-30/9048.md
+++ b/changelog/3.0.0_2022-11-30/9048.md
@@ -1,5 +1,5 @@
-Bugfix: Fix copy url location for private links
+Bugfix: Fix copy URL location for private links
 
-We fixed a bug where a placeholder was copied to the clipboard instead of the url.
+We fixed a bug where a placeholder was copied to the clipboard instead of the URL.
 
 https://github.com/owncloud/client/issues/9048
diff --git a/changelog/4.0.0_2023-05-11/10518.md b/changelog/4.0.0_2023-05-11/10518.md
index f7ea1517cfc..2a7bb4cd1fb 100644
--- a/changelog/4.0.0_2023-05-11/10518.md
+++ b/changelog/4.0.0_2023-05-11/10518.md
@@ -1,4 +1,4 @@
-Enhancement: Branding: Allow the addition of buttons to open an url
+Enhancement: Branding: Allow the addition of buttons to open a URL
 
 We added a branding option that allows to add buttons to the toolbar.
 Those buttons will then open a hardcoded web page.
diff --git a/changelog/4.0.0_2023-05-11/10634.md b/changelog/4.0.0_2023-05-11/10634.md
index 5169bf40388..78bdd626bb0 100644
--- a/changelog/4.0.0_2023-05-11/10634.md
+++ b/changelog/4.0.0_2023-05-11/10634.md
@@ -1,6 +1,6 @@
 Enhancement: Always point to the latest documentation
 
-We used an url for the documentation that contained the client version.
+We used a URL for the documentation that contained the client version.
 While this ensured a used would get the documentation matching to their client, this only worked with the last two released clients.
 So users of a pre-release or of a very old client where served a 404.
 
diff --git a/changelog/4.1.0_2023-06-15/enterprise-5743.md b/changelog/4.1.0_2023-06-15/enterprise-5743.md
index f15d2f79975..cb3a83086dd 100644
--- a/changelog/4.1.0_2023-06-15/enterprise-5743.md
+++ b/changelog/4.1.0_2023-06-15/enterprise-5743.md
@@ -1,6 +1,6 @@
 Bugfix: Follow same site redirects in the Wizard
 
 We fixed a bug where the client did not follow same site redirects during the setup.
-If the used url https://test.com/owncloud redirected to https://test.com the new url was not correctly used for the newly created account.
+If the used URL https://test.com/owncloud redirected to https://test.com the new URL was not correctly used for the newly created account.
 
 https://github.com/owncloud/enterprise/issues/5743
diff --git a/changelog/4.2.0_2023-08-07/10946.md b/changelog/4.2.0_2023-08-07/10946.md
index bd4f0be850b..e87fa1daef0 100644
--- a/changelog/4.2.0_2023-08-07/10946.md
+++ b/changelog/4.2.0_2023-08-07/10946.md
@@ -1,5 +1,5 @@
 Bugfix: Wrong davUser in cmd client
 
-We fixed a bug where the wrong dav user was used in the url, when the username from the credentials differed from the username used on the server.
+We fixed a bug where the wrong dav user was used in the URL, when the username from the credentials differed from the username used on the server.
 
 https://github.com/owncloud/client/issues/10946
diff --git a/changelog/5.2.0_2023-11-27/11296.md b/changelog/5.2.0_2023-11-27/11296.md
index 0b3f1a80ad2..74770dd9b0d 100644
--- a/changelog/5.2.0_2023-11-27/11296.md
+++ b/changelog/5.2.0_2023-11-27/11296.md
@@ -1,7 +1,7 @@
-Bugfix: Fix url resolution for app provider
+Bugfix: Fix URL resolution for app provider
 
-We fixed a bug in the url resolution for the app provider.
-If owncloud is installed to a non-root directory we computed a wrong url for the app provider urls.
+We fixed a bug in the URL resolution for the app provider.
+If owncloud is installed to a non-root directory we computed a wrong URL for the app provider urls.
 This could trigger a connection validation in the client, which intern triggered a request to the app provider.
 Resulting in an endless loop rendering the client unusable.
 
diff --git a/changelog/CHANGELOG.tmpl b/changelog/CHANGELOG.tmpl
index a737a69ccc8..fcbde4a1059 100644
--- a/changelog/CHANGELOG.tmpl
+++ b/changelog/CHANGELOG.tmpl
@@ -169,7 +169,7 @@ Some small changes and bug fixes:
 * Log: Print critical and fatal messages to stderr
 * Doc: Migrate the documentation to Antora (#6785)
 * Doc: Update Windows build instructions
-* Doc: Add explanation of how to manually change server url (#6579)
+* Doc: Add explanation of how to manually change server URL (#6579)
 * Doc: List more environment variables
 * Doc: List more config file options (owncloud/docs#1365)
 * Build: Fix KDEInstallDirs deprecation warnings (#6922)
@@ -1190,7 +1190,7 @@ version 1.4.1 (release 2013-09-24 ), csync 0.90.1 required
   * Fixed various folder wizard issues, bug #992
   * Made "Sync started" message optional, fixes bug #934
   * Fixed shutdown, avoid crashed config on win32, fixes bug #945
-  * Pop up config wizard if no server url is configured, fixes bug #1018
+  * Pop up config wizard if no server URL is configured, fixes bug #1018
   * Settings: calculate sidebar width dynamically, fixes bug #1020
   * Fixed a crash if sync folders were removed, fixes bug #713
   * Do proper re-sync after network disconnect, fixes bug #1007
@@ -1385,7 +1385,7 @@ version 1.0.5 (release 2012-08-14), csync 0.50.8 required
 version 1.0.4 (release 2012-08-10), csync 0.50.8 required
   * [APP] ownCloud is now a single instance app, can not start twice any more.
   * [APP] Proxy support
-  * [APP] Handle HTTP redirection correctly, note new url.
+  * [APP] Handle HTTP redirection correctly, note new URL.
   * [APP] More relaxed handling of read only directories in the sync paths.
   * [APP] Started to split off a library with sync functionality, eg for KDE
   * [APP] Make ownCloud Info class a singleton, more robust.
diff --git a/src/cmd/cmd.cpp b/src/cmd/cmd.cpp
index 80c21018ac4..a9b4a11c0c8 100644
--- a/src/cmd/cmd.cpp
+++ b/src/cmd/cmd.cpp
@@ -286,7 +286,8 @@ CmdOptions parseOptions(const QStringList &app_args)
     auto excludeOption = addOption({ { QStringLiteral("exclude") }, QStringLiteral("Path to an exclude list [file]"), QStringLiteral("file") });
     auto unsyncedfoldersOption = addOption({ { QStringLiteral("unsyncedfolders") }, QStringLiteral("File containing the list of unsynced remote folders (selective sync)"), QStringLiteral("file") });
 
-    auto serverOption = addOption({ { QStringLiteral("server") }, QStringLiteral("Use [url] as the location of the server. OCIS only (server location and spaces url can differ)"), QStringLiteral("url") });
+    auto serverOption = addOption({{QStringLiteral("server")},
+        QStringLiteral("Use [url] as the location of the server. OCIS only (server location and spaces URL can differ)"), QStringLiteral("url")});
     auto userOption = addOption({ { QStringLiteral("u"), QStringLiteral("user") }, QStringLiteral("Use [name] as the login name"), QStringLiteral("name") });
     auto passwordOption = addOption({{QStringLiteral("p"), QStringLiteral("password")}, QStringLiteral("Use [pass] as password"), QStringLiteral("password")});
 
@@ -305,7 +306,7 @@ CmdOptions parseOptions(const QStringList &app_args)
     parser.addVersionOption();
 
     parser.addPositionalArgument(QStringLiteral("source_dir"), QStringLiteral("The source dir"));
-    parser.addPositionalArgument(QStringLiteral("server_url"), QStringLiteral("The url to the server"));
+    parser.addPositionalArgument(QStringLiteral("server_url"), QStringLiteral("The URL to the server"));
     parser.addPositionalArgument(QStringLiteral("remote_folder"), QStringLiteral("A remote folder"));
 
     parser.process(app_args);
@@ -422,7 +423,7 @@ int main(int argc, char **argv)
 
         const QUrl baseUrl = [&ctx] {
             auto tmp = ctx.options.server_url;
-            // Find the folder and the original owncloud url
+            // 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")));
diff --git a/src/gui/accountmanager.cpp b/src/gui/accountmanager.cpp
index 047866b2cb6..93b6d536149 100644
--- a/src/gui/accountmanager.cpp
+++ b/src/gui/accountmanager.cpp
@@ -165,7 +165,7 @@ bool AccountManager::restoreFromLegacySettings()
             auto oCSettings = std::make_unique<QSettings>(oCCfgFile, QSettings::IniFormat);
             oCSettings->beginGroup(QStringLiteral("ownCloud"));
 
-            // Check the theme url to see if it is the same url that the oC config was for
+            // Check the theme URL to see if it is the same URL that the oC config was for
             QString overrideUrl = Theme::instance()->overrideServerUrlV2();
             if (!overrideUrl.isEmpty()) {
                 if (overrideUrl.endsWith(QLatin1Char('/'))) {
diff --git a/src/gui/connectionvalidator.cpp b/src/gui/connectionvalidator.cpp
index 1cf5f407615..fc580e258f5 100644
--- a/src/gui/connectionvalidator.cpp
+++ b/src/gui/connectionvalidator.cpp
@@ -159,7 +159,7 @@ void ConnectionValidator::slotStatusFound(const QUrl &url, const QJsonObject &in
                                   << url << " with version "
                                   << info.value(QLatin1String("versionstring")).toString();
 
-    // Update server url in case of redirection
+    // Update server URL in case of redirection
     if (_account->url() != url) {
         qCInfo(lcConnectionValidator()) << "status.php was redirected to" << url.toString() << "asking user to accept and abort for now";
         Q_EMIT _account->requestUrlUpdate(url);
diff --git a/src/gui/folder.cpp b/src/gui/folder.cpp
index 8ccaa3674b5..7db47008c5d 100644
--- a/src/gui/folder.cpp
+++ b/src/gui/folder.cpp
@@ -812,7 +812,7 @@ void Folder::saveToSettings() const
         }
     }
     // with spaces we rely on the space id
-    // we save the dav url nevertheless to have it available during startup
+    // we save the dav URL nevertheless to have it available during startup
     definitionToSave.setWebDavUrl(webDavUrl());
 
     // keep the scope of the interaction with the settings limited to prevent possible loss of settings
diff --git a/src/gui/folder.h b/src/gui/folder.h
index 303e6193056..6c47ffc4e36 100644
--- a/src/gui/folder.h
+++ b/src/gui/folder.h
@@ -95,8 +95,8 @@ class OWNCLOUDGUI_EXPORT FolderDefinition
     // could change in the case of spaces
     void setWebDavUrl(const QUrl &url) { _webDavUrl = url; }
 
-    // when using spaces we don't store the dav url but the space id
-    // this id is then used to look up the dav url
+    // when using spaces we don't store the dav URL but the space id
+    // this id is then used to look up the dav URL
     QString spaceId() const;
 
     void setSpaceId(const QString &spaceId) { _spaceId = spaceId; }
@@ -199,7 +199,7 @@ class OWNCLOUDGUI_EXPORT Folder : public QObject
     QString remotePath() const;
 
     /**
-     * The full remote webdav url
+     * The full remote webdav URL
      */
     QUrl webDavUrl() const;
 
@@ -209,7 +209,7 @@ class OWNCLOUDGUI_EXPORT Folder : public QObject
     QString remotePathTrailingSlash() const;
 
     /**
-     * remote folder path with server url
+     * remote folder path with server URL
      */
     QUrl remoteUrl() const;
 
diff --git a/src/gui/folderman.cpp b/src/gui/folderman.cpp
index e505c76dfcf..00c05a6d05e 100644
--- a/src/gui/folderman.cpp
+++ b/src/gui/folderman.cpp
@@ -244,7 +244,7 @@ bool FolderMan::setupFoldersHelper(QSettings &settings, AccountStatePtr account)
             return defaultPath;
         }();
 
-        // migration: 2.10 did not specify a webdav url
+        // migration: 2.10 did not specify a webdav URL
         if (folderDefinition._webDavUrl.isEmpty()) {
             folderDefinition._webDavUrl = account->account()->davUrl();
         }
diff --git a/src/gui/folderman.h b/src/gui/folderman.h
index 6b62a94f3d8..9e8175c2371 100644
--- a/src/gui/folderman.h
+++ b/src/gui/folderman.h
@@ -96,7 +96,7 @@ class OWNCLOUDGUI_EXPORT FolderMan : public QObject
     struct SyncConnectionDescription
     {
         /***
--         * The webdav url for the sync connection.
+-         * The webdav URL for the sync connection.
          */
         QUrl davUrl;
 
diff --git a/src/gui/guiutility.h b/src/gui/guiutility.h
index 6638e8e612c..b4e87f33d60 100644
--- a/src/gui/guiutility.h
+++ b/src/gui/guiutility.h
@@ -29,7 +29,7 @@ Q_DECLARE_LOGGING_CATEGORY(lcGuiUtility)
 
 namespace Utility {
 
-    /** Open an url in the browser.
+    /** Open a URL in the browser.
      *
      * If launching the browser fails, display a message.
      */
diff --git a/src/gui/networksettings.cpp b/src/gui/networksettings.cpp
index 6f793c60c09..12f9ba844a9 100644
--- a/src/gui/networksettings.cpp
+++ b/src/gui/networksettings.cpp
@@ -291,7 +291,7 @@ void NetworkSettings::checkAccountLocalhost()
         // effect for localhost (#7169)
         for (const auto &account : AccountManager::instance()->accounts()) {
             const auto host = account->account()->url().host();
-            // Some typical url for localhost
+            // Some typical URL for localhost
             if (host == QLatin1String("localhost") || host.startsWith(QLatin1String("127.")) || host == QLatin1String("[::1]"))
                 visible = true;
         }
diff --git a/src/gui/owncloudgui.cpp b/src/gui/owncloudgui.cpp
index a4cd87fdcf6..5e86886cb1f 100644
--- a/src/gui/owncloudgui.cpp
+++ b/src/gui/owncloudgui.cpp
@@ -712,7 +712,7 @@ void ownCloudGui::slotShowOptionalTrayMessage(const QString &title, const QStrin
 void ownCloudGui::slotFolderOpenAction(Folder *f)
 {
     if (f) {
-        qCInfo(lcApplication) << "opening local url " << f->path();
+        qCInfo(lcApplication) << "opening local URL " << f->path();
         QUrl url = QUrl::fromLocalFile(f->path());
 
 #ifdef Q_OS_WIN
diff --git a/src/gui/qml/AccountBar.qml b/src/gui/qml/AccountBar.qml
index 228ef43fc06..c13a68fecc8 100644
--- a/src/gui/qml/AccountBar.qml
+++ b/src/gui/qml/AccountBar.qml
@@ -159,7 +159,7 @@ Pane {
             }
         }
         Repeater {
-            // branded buttons with an url
+            // branded buttons with a URL
             model: Theme.urlButtons
 
             delegate: AccountButton {
diff --git a/src/gui/updateurldialog.cpp b/src/gui/updateurldialog.cpp
index 3b3444aaf6c..a897ebfb921 100644
--- a/src/gui/updateurldialog.cpp
+++ b/src/gui/updateurldialog.cpp
@@ -36,14 +36,14 @@ UpdateUrlDialog::UpdateUrlDialog(const QString &title, const QString &content, c
         return;
     }
 
-    addButton(tr("Change url permanently to %1").arg(_newUrl.toString()), QMessageBox::AcceptRole);
+    addButton(tr("Change URL permanently to %1").arg(_newUrl.toString()), QMessageBox::AcceptRole);
     addButton(tr("Reject"), QMessageBox::RejectRole);
 }
 
 UpdateUrlDialog *UpdateUrlDialog::fromAccount(AccountPtr account, const QUrl &newUrl, QWidget *parent)
 {
     return new UpdateUrlDialog(tr("Url update requested for %1").arg(account->displayNameWithHost()),
-        tr("The url for %1 changed from %2 to %3, do you want to accept the changed url?")
+        tr("The URL for %1 changed from %2 to %3, do you want to accept the changed URL?")
             .arg(account->displayNameWithHost(), account->url().toString(), newUrl.toString()),
         account->url(), newUrl, parent);
 }