diff --git a/apps/files_external/appinfo/app.php b/apps/files_external/appinfo/app.php
index f8f7d377bc..15254b2900 100644
--- a/apps/files_external/appinfo/app.php
+++ b/apps/files_external/appinfo/app.php
@@ -43,7 +43,7 @@ $appContainer = \OCA\Files_External\MountConfig::$app->getContainer();
 		'appname' => 'files_external',
 		'script' => 'list.php',
 		'order' => 30,
-		'name' => $l->t('External storages'),
+		'name' => $l->t('External storage'),
 	];
 });
 
diff --git a/apps/files_external/js/app.js b/apps/files_external/js/app.js
index cf74ae350d..4f91e2e78b 100644
--- a/apps/files_external/js/app.js
+++ b/apps/files_external/js/app.js
@@ -34,7 +34,7 @@ OCA.Files_External.App = {
 		);
 
 		this._extendFileList(this.fileList);
-		this.fileList.appName = t('files_external', 'External storages');
+		this.fileList.appName = t('files_external', 'External storage');
 		return this.fileList;
 	},
 
diff --git a/apps/files_external/js/mountsfilelist.js b/apps/files_external/js/mountsfilelist.js
index 034c29c05c..c5817a916f 100644
--- a/apps/files_external/js/mountsfilelist.js
+++ b/apps/files_external/js/mountsfilelist.js
@@ -28,7 +28,7 @@
 
 	FileList.prototype = _.extend({}, OCA.Files.FileList.prototype,
 		/** @lends OCA.Files_External.FileList.prototype */ {
-		appName: 'External storages',
+		appName: 'External storage',
 
 		_allowSelection: false,
 
diff --git a/apps/files_external/lib/Service/GlobalStoragesService.php b/apps/files_external/lib/Service/GlobalStoragesService.php
index 22c366d5bb..2c195bd869 100644
--- a/apps/files_external/lib/Service/GlobalStoragesService.php
+++ b/apps/files_external/lib/Service/GlobalStoragesService.php
@@ -33,7 +33,7 @@ use OC\Files\Filesystem;
 use OCA\Files_External\Lib\StorageConfig;
 
 /**
- * Service class to manage global external storages
+ * Service class to manage global external storage
  */
 class GlobalStoragesService extends StoragesService {
 	/**
diff --git a/apps/files_external/lib/Service/LegacyStoragesService.php b/apps/files_external/lib/Service/LegacyStoragesService.php
index 825921832c..60f6118284 100644
--- a/apps/files_external/lib/Service/LegacyStoragesService.php
+++ b/apps/files_external/lib/Service/LegacyStoragesService.php
@@ -97,7 +97,7 @@ abstract class LegacyStoragesService {
 	}
 
 	/**
-	 * Read the external storages config
+	 * Read the external storage config
 	 *
 	 * @return StorageConfig[] map of storage id to storage config
 	 */
diff --git a/apps/files_external/lib/Service/StoragesService.php b/apps/files_external/lib/Service/StoragesService.php
index 334b1c5041..aed05e2725 100644
--- a/apps/files_external/lib/Service/StoragesService.php
+++ b/apps/files_external/lib/Service/StoragesService.php
@@ -45,7 +45,7 @@ use OCP\Files\StorageNotAvailableException;
 use OCP\ILogger;
 
 /**
- * Service class to manage external storages
+ * Service class to manage external storage
  */
 abstract class StoragesService {
 
@@ -125,7 +125,7 @@ abstract class StoragesService {
 	}
 
 	/**
-	 * Read the external storages config
+	 * Read the external storage config
 	 *
 	 * @return array map of storage id to storage config
 	 */
diff --git a/apps/files_external/lib/Service/UserStoragesService.php b/apps/files_external/lib/Service/UserStoragesService.php
index 138876f4e1..770a4f25e0 100644
--- a/apps/files_external/lib/Service/UserStoragesService.php
+++ b/apps/files_external/lib/Service/UserStoragesService.php
@@ -36,7 +36,7 @@ use OCP\Files\Config\IUserMountCache;
 use OCP\IUserSession;
 
 /**
- * Service class to manage user external storages
+ * Service class to manage user external storage
  * (aka personal storages)
  */
 class UserStoragesService extends StoragesService {
diff --git a/apps/files_external/lib/Settings/Section.php b/apps/files_external/lib/Settings/Section.php
index 50f9707118..02cb12c5b3 100644
--- a/apps/files_external/lib/Settings/Section.php
+++ b/apps/files_external/lib/Settings/Section.php
@@ -60,7 +60,7 @@ class Section implements IIconSection {
 	 * @return string
 	 */
 	public function getName() {
-		return $this->l->t('External storages');
+		return $this->l->t('External storage');
 	}
 
 	/**
diff --git a/apps/files_external/templates/settings.php b/apps/files_external/templates/settings.php
index 45858709a0..a9bf5bd3af 100644
--- a/apps/files_external/templates/settings.php
+++ b/apps/files_external/templates/settings.php
@@ -101,7 +101,7 @@ $canCreateMounts = $_['visibilityType'] === BackendService::VISIBILITY_ADMIN ||
 </div>
 
 <form data-can-create="<?php echo $canCreateMounts?'true':'false' ?>" id="files_external" class="section" data-encryption-enabled="<?php echo $_['encryptionEnabled']?'true': 'false'; ?>">
-	<h2 class="inlineblock" data-anchor-name="external-storage"><?php p($l->t('External storages')); ?></h2>
+	<h2 class="inlineblock" data-anchor-name="external-storage"><?php p($l->t('External storage')); ?></h2>
 	<a target="_blank" rel="noreferrer" class="icon-info" title="<?php p($l->t('Open documentation'));?>" href="<?php p(link_to_docs('admin-external-storage')); ?>"></a>
 	<p class="settings-hint"><?php p($l->t('External storage enables you to mount external storage services and devices as secondary Nextcloud storage devices. You may also allow users to mount their own external storage services.')); ?></p>
 	<?php if (isset($_['dependencies']) and ($_['dependencies'] !== '') and $canCreateMounts) {
@@ -207,7 +207,7 @@ $canCreateMounts = $_['visibilityType'] === BackendService::VISIBILITY_ADMIN ||
 	<form autocomplete="false" action="#"
 		  id="global_credentials" method="post">
 		<h2><?php p($l->t('Global credentials')); ?></h2>
-		<p class="settings-hint"><?php p($l->t('Global credentials can be used to authenticate with multiple external storages that have the same credentials.')); ?></p>
+		<p class="settings-hint"><?php p($l->t('Global credentials can be used to authenticate with multiple external storage that have the same credentials.')); ?></p>
 		<input type="text" name="username"
 			   autocomplete="false"
 			   value="<?php p($_['globalCredentials']['user']); ?>"
diff --git a/apps/files_external/tests/Settings/SectionTest.php b/apps/files_external/tests/Settings/SectionTest.php
index fe9dde4f54..96bf1cd1eb 100644
--- a/apps/files_external/tests/Settings/SectionTest.php
+++ b/apps/files_external/tests/Settings/SectionTest.php
@@ -57,10 +57,10 @@ class SectionTest extends TestCase {
 		$this->l
 			->expects($this->once())
 			->method('t')
-			->with('External storages')
-			->willReturn('External storages');
+			->with('External storage')
+			->willReturn('External storage');
 
-		$this->assertSame('External storages', $this->section->getName());
+		$this->assertSame('External storage', $this->section->getName());
 	}
 
 	public function testGetPriority() {
diff --git a/apps/files_external/tests/js/mountsfilelistSpec.js b/apps/files_external/tests/js/mountsfilelistSpec.js
index 309c87948c..cbc7ff415e 100644
--- a/apps/files_external/tests/js/mountsfilelistSpec.js
+++ b/apps/files_external/tests/js/mountsfilelistSpec.js
@@ -72,7 +72,7 @@ describe('OCA.Files_External.FileList tests', function() {
 		alertStub.restore();
 	});
 
-	describe('loading file list for external storages', function() {
+	describe('loading file list for external storage', function() {
 		var ocsResponse;
 		var reloading;
 
diff --git a/apps/files_sharing/lib/External/Mount.php b/apps/files_sharing/lib/External/Mount.php
index 1287419881..8ed0418214 100644
--- a/apps/files_sharing/lib/External/Mount.php
+++ b/apps/files_sharing/lib/External/Mount.php
@@ -71,7 +71,7 @@ class Mount extends MountPoint implements MoveableMount {
 	}
 
 	/**
-	 * Get the type of mount point, used to distinguish things like shares and external storages
+	 * Get the type of mount point, used to distinguish things like shares and external storage
 	 * in the web interface
 	 *
 	 * @return string
diff --git a/apps/workflowengine/lib/Check/FileName.php b/apps/workflowengine/lib/Check/FileName.php
index 9a564f85f6..b2442410af 100644
--- a/apps/workflowengine/lib/Check/FileName.php
+++ b/apps/workflowengine/lib/Check/FileName.php
@@ -54,7 +54,7 @@ class FileName extends AbstractStringCheck implements IFileCheck {
 	protected function getActualValue(): string {
 		$fileName = $this->path === null ? '' : basename($this->path);
 		if ($fileName === '' && (!$this->storage->isLocal() || $this->storage->instanceOfStorage(Local::class))) {
-			// Return the mountpoint name of external storages that are not mounted as user home
+			// Return the mountpoint name of external storage that are not mounted as user home
 			$mountPoints = $this->mountManager->findByStorageId($this->storage->getId());
 			if (empty($mountPoints) || $mountPoints[0]->getMountType() !== 'external') {
 				return $fileName;
diff --git a/build/integration/features/external-storage.feature b/build/integration/features/external-storage.feature
index 59a873dd81..d92cca3c45 100644
--- a/build/integration/features/external-storage.feature
+++ b/build/integration/features/external-storage.feature
@@ -24,7 +24,7 @@ Feature: external-storage
       | token | A_TOKEN |
       | mimetype | httpd/unix-directory |
 
-  Scenario: Shares don't overwrite external storages
+  Scenario: Shares don't overwrite external storage
     Given user "user0" exists
     And user "user1" exists
     And As an "user0"
diff --git a/config/config.sample.php b/config/config.sample.php
index e352c86b26..4895b6a7c8 100644
--- a/config/config.sample.php
+++ b/config/config.sample.php
@@ -1548,7 +1548,7 @@ $CONFIG = [
 /**
  * Override where Nextcloud stores temporary files. Useful in situations where
  * the system temporary directory is on a limited space ramdisk or is otherwise
- * restricted, or if external storages which do not support streaming are in
+ * restricted, or if external storage which do not support streaming are in
  * use.
  *
  * The Web server user must have write access to this directory.
@@ -1682,7 +1682,7 @@ $CONFIG = [
 /**
  * Specifies how often the local filesystem (the Nextcloud data/ directory, and
  * NFS mounts in data/) is checked for changes made outside Nextcloud. This
- * does not apply to external storages.
+ * does not apply to external storage.
  *
  * 0 -> Never check the filesystem for outside changes, provides a performance
  * increase when it's certain that no changes are made directly to the
diff --git a/lib/private/Share20/Manager.php b/lib/private/Share20/Manager.php
index 70facc442c..983653b766 100644
--- a/lib/private/Share20/Manager.php
+++ b/lib/private/Share20/Manager.php
@@ -1665,7 +1665,7 @@ class Manager implements IManager {
 			return $al;
 		}
 
-		//Get node for the owner and correct the owner in case of external storages
+		//Get node for the owner and correct the owner in case of external storage
 		$userFolder = $this->rootFolder->getUserFolder($owner);
 		if ($path->getId() !== $userFolder->getId() && !$userFolder->isSubNode($path)) {
 			$nodes = $userFolder->getById($path->getId());
diff --git a/lib/private/Streamer.php b/lib/private/Streamer.php
index 0e3018f77b..e76ad2afee 100644
--- a/lib/private/Streamer.php
+++ b/lib/private/Streamer.php
@@ -78,7 +78,7 @@ class Streamer {
 		 * larger than 4GiB), but it should not happen in the real world.
 		 *
 		 * We also have to check for a size above 0. As negative sizes could be
-		 * from not fully scanned external storages. And then things fall apart
+		 * from not fully scanned external storage. And then things fall apart
 		 * if somebody tries to package to much.
 		 */
 		if ($size > 0 && $size < 4 * 1000 * 1000 * 1000 && $numberOfFiles < 65536) {
diff --git a/lib/public/Files/Config/IUserMountCache.php b/lib/public/Files/Config/IUserMountCache.php
index cdb95078bc..763dd1edca 100644
--- a/lib/public/Files/Config/IUserMountCache.php
+++ b/lib/public/Files/Config/IUserMountCache.php
@@ -111,7 +111,7 @@ interface IUserMountCache {
 	 * Get the used space for users
 	 *
 	 * Note that this only includes the space in their home directory,
-	 * not any incoming shares or external storages.
+	 * not any incoming shares or external storage.
 	 *
 	 * @param IUser[] $users
 	 * @return int[] [$userId => $userSpace]
diff --git a/lib/public/Files/Mount/IMountPoint.php b/lib/public/Files/Mount/IMountPoint.php
index 51a5fbade4..4c424d6343 100644
--- a/lib/public/Files/Mount/IMountPoint.php
+++ b/lib/public/Files/Mount/IMountPoint.php
@@ -121,7 +121,7 @@ interface IMountPoint {
 	public function getMountId();
 
 	/**
-	 * Get the type of mount point, used to distinguish things like shares and external storages
+	 * Get the type of mount point, used to distinguish things like shares and external storage
 	 * in the web interface
 	 *
 	 * @return string