diff --git a/mods/bookmarklet-share2friendica/README.md b/mods/bookmarklet-share2friendica/README.md
index ad30baa9d..45f94af74 100644
--- a/mods/bookmarklet-share2friendica/README.md
+++ b/mods/bookmarklet-share2friendica/README.md
@@ -20,7 +20,7 @@ javascript:(function(){f='https://myfriend.myfami.ly/bookmarklet/?url='+encodeUR
 
 *Please copy the whole script, not only the part mentioned here!*
 
-Then create a new bookmark, give it a name like "share2Friendica" and paste the script in the address field. Save it. Now you can click on that bookmarklet every time you want to share a website, you are currently reading. A new small window will open where title is prefilled and the website you want to share is put as attachement in the body of the new post.
+Then create a new bookmark, give it a name like "share2Friendica" and paste the script in the address field. Save it. Now you can click on that bookmarklet every time you want to share a website, you are currently reading. A new small window will open where title is prefilled and the website you want to share is put as attachment in the body of the new post.
 
 ## Additional notes if it doesn't work
 
diff --git a/src/Core/Storage/Capability/ICanWriteToStorage.php b/src/Core/Storage/Capability/ICanWriteToStorage.php
index 2c6a45384..30842180a 100644
--- a/src/Core/Storage/Capability/ICanWriteToStorage.php
+++ b/src/Core/Storage/Capability/ICanWriteToStorage.php
@@ -27,7 +27,7 @@ use Friendica\Core\Storage\Exception\StorageException;
 /**
  * Interface for writable storage backends
  *
- * Used for storages with CRUD functionality, mainly used for user data (e.g. photos, attachements).
+ * Used for storages with CRUD functionality, mainly used for user data (e.g. photos, attachments).
  * There's only one active writable storage possible. This type of storage is selectable by the current administrator.
  */
 interface ICanWriteToStorage extends ICanReadFromStorage
diff --git a/src/Factory/Api/Mastodon/Status.php b/src/Factory/Api/Mastodon/Status.php
index 62941978e..5e5df916a 100644
--- a/src/Factory/Api/Mastodon/Status.php
+++ b/src/Factory/Api/Mastodon/Status.php
@@ -55,7 +55,7 @@ class Status extends BaseFactory
 	/** @var Card */
 	private $mstdnCardFactory;
 	/** @var Attachment */
-	private $mstdnAttachementFactory;
+	private $mstdnAttachmentFactory;
 	/** @var Error */
 	private $mstdnErrorFactory;
 	/** @var Poll */
@@ -70,21 +70,21 @@ class Status extends BaseFactory
 		Mention $mstdnMentionFactory,
 		Tag $mstdnTagFactory,
 		Card $mstdnCardFactory,
-		Attachment $mstdnAttachementFactory,
+		Attachment $mstdnAttachmentFactory,
 		Error $mstdnErrorFactory,
 		Poll $mstdnPollFactory,
 		ContentItem $contentItem
 	) {
 		parent::__construct($logger);
-		$this->dba                     = $dba;
-		$this->mstdnAccountFactory     = $mstdnAccountFactory;
-		$this->mstdnMentionFactory     = $mstdnMentionFactory;
-		$this->mstdnTagFactory         = $mstdnTagFactory;
-		$this->mstdnCardFactory        = $mstdnCardFactory;
-		$this->mstdnAttachementFactory = $mstdnAttachementFactory;
-		$this->mstdnErrorFactory       = $mstdnErrorFactory;
-		$this->mstdnPollFactory        = $mstdnPollFactory;
-		$this->contentItem             = $contentItem;
+		$this->dba                    = $dba;
+		$this->mstdnAccountFactory    = $mstdnAccountFactory;
+		$this->mstdnMentionFactory    = $mstdnMentionFactory;
+		$this->mstdnTagFactory        = $mstdnTagFactory;
+		$this->mstdnCardFactory       = $mstdnCardFactory;
+		$this->mstdnAttachmentFactory = $mstdnAttachmentFactory;
+		$this->mstdnErrorFactory      = $mstdnErrorFactory;
+		$this->mstdnPollFactory       = $mstdnPollFactory;
+		$this->contentItem            = $contentItem;
 	}
 
 	/**
@@ -206,7 +206,7 @@ class Status extends BaseFactory
 		$tags        = $this->mstdnTagFactory->createFromUriId($uriId);
 		if ($item['has-media']) {
 			$card        = $this->mstdnCardFactory->createFromUriId($uriId);
-			$attachments = $this->mstdnAttachementFactory->createFromUriId($uriId);
+			$attachments = $this->mstdnAttachmentFactory->createFromUriId($uriId);
 		} else {
 			$card        = new \Friendica\Object\Api\Mastodon\Card([]);
 			$attachments = [];
@@ -250,7 +250,7 @@ class Status extends BaseFactory
 					}
 				}
 
-				foreach ($this->mstdnAttachementFactory->createFromUriId($shared_uri_id) as $attachment) {
+				foreach ($this->mstdnAttachmentFactory->createFromUriId($shared_uri_id) as $attachment) {
 					if (!in_array($attachment, $attachments)) {
 						$attachments[] = $attachment;
 					}
diff --git a/view/js/linkPreview.js b/view/js/linkPreview.js
index 9300784d3..826928148 100644
--- a/view/js/linkPreview.js
+++ b/view/js/linkPreview.js
@@ -500,7 +500,7 @@
 		};
 
 		/**
-		 * Convert attachmant bbcode into an array.
+		 * Convert attachment bbcode into an array.
 		 * 
 		 * @param {string} content Text content with the attachment bbcode.
 		 * @returns {object || null}