diff --git a/api/migrations/models/index.ts b/api/migrations/models/index.ts
index aa453074..02622a85 100644
--- a/api/migrations/models/index.ts
+++ b/api/migrations/models/index.ts
@@ -63,7 +63,7 @@ async function mongoMigrationConnection() {
 
 async function getModels() {
   await mongoMigrationConnection();
-  const AttachementModel = mongoose.model<Attachment>(
+  const AttachmentModel = mongoose.model<Attachment>(
     Attachment.name,
     attachmentSchema,
   );
@@ -117,7 +117,7 @@ async function getModels() {
   const UserModel = mongoose.model<User>(User.name, userSchema);
 
   return {
-    AttachementModel,
+    AttachmentModel,
     BlockModel,
     BotstatsModel,
     ContentModel,
diff --git a/api/src/attachment/controllers/attachment.controller.ts b/api/src/attachment/controllers/attachment.controller.ts
index e9e8a4be..9cc8a059 100644
--- a/api/src/attachment/controllers/attachment.controller.ts
+++ b/api/src/attachment/controllers/attachment.controller.ts
@@ -73,8 +73,8 @@ export class AttachmentController extends BaseController<Attachment> {
   async findOne(@Param('id') id: string): Promise<Attachment> {
     const doc = await this.attachmentService.findOne(id);
     if (!doc) {
-      this.logger.warn(`Unable to find Attachement by id ${id}`);
-      throw new NotFoundException(`Attachement with ID ${id} not found`);
+      this.logger.warn(`Unable to find Attachment by id ${id}`);
+      throw new NotFoundException(`Attachment with ID ${id} not found`);
     }
     return doc;
   }
diff --git a/frontend/src/components/contents/ContentImportDialog.tsx b/frontend/src/components/contents/ContentImportDialog.tsx
index 41954ece..4ed2a4f8 100644
--- a/frontend/src/components/contents/ContentImportDialog.tsx
+++ b/frontend/src/components/contents/ContentImportDialog.tsx
@@ -31,7 +31,7 @@ export const ContentImportDialog: FC<ContentImportDialogProps> = ({
   closeDialog,
   ...rest
 }) => {
-  const [attachmentId, setAttachementId] = useState<string | null>(null);
+  const [attachmentId, setAttachmentId] = useState<string | null>(null);
   const { t } = useTranslate();
   const { toast } = useToast();
   const { apiClient } = useApiClient();
@@ -58,7 +58,7 @@ export const ContentImportDialog: FC<ContentImportDialogProps> = ({
   );
   const handleCloseDialog = () => {
     closeDialog();
-    setAttachementId(null);
+    setAttachmentId(null);
   };
   const handleImportClick = () => {
     if (attachmentId && data?.contentType?.id) {
@@ -76,7 +76,7 @@ export const ContentImportDialog: FC<ContentImportDialogProps> = ({
               format="basic"
               accept="text/csv"
               onChange={(id, _) => {
-                setAttachementId(id);
+                setAttachmentId(id);
               }}
               label=""
               value={attachmentId}
diff --git a/frontend/src/components/nlp/NlpImportDialog.tsx b/frontend/src/components/nlp/NlpImportDialog.tsx
index d62e0bd7..c539c580 100644
--- a/frontend/src/components/nlp/NlpImportDialog.tsx
+++ b/frontend/src/components/nlp/NlpImportDialog.tsx
@@ -29,7 +29,7 @@ export const NlpImportDialog: FC<NlpImportDialogProps> = ({
   closeDialog,
   ...rest
 }) => {
-  const [attachmentId, setAttachementId] = useState<string | null>(null);
+  const [attachmentId, setAttachmentId] = useState<string | null>(null);
   const { t } = useTranslate();
   const queryClient = useQueryClient();
   const { toast } = useToast();
@@ -63,7 +63,7 @@ export const NlpImportDialog: FC<NlpImportDialogProps> = ({
   );
   const handleCloseDialog = () => {
     closeDialog();
-    setAttachementId(null);
+    setAttachmentId(null);
   };
 
   return (
@@ -76,7 +76,7 @@ export const NlpImportDialog: FC<NlpImportDialogProps> = ({
               format="basic"
               accept="text/csv"
               onChange={(id, _) => {
-                setAttachementId(id);
+                setAttachmentId(id);
               }}
               label=""
               value={attachmentId}
diff --git a/frontend/src/components/visual-editor/form/MessageForm.tsx b/frontend/src/components/visual-editor/form/MessageForm.tsx
index eefff207..e8a4e9d7 100644
--- a/frontend/src/components/visual-editor/form/MessageForm.tsx
+++ b/frontend/src/components/visual-editor/form/MessageForm.tsx
@@ -24,7 +24,7 @@ export const MessageForm = () => {
       {/* TEXT BLOCK */}
       {Array.isArray(block?.message) ? <TextMessageForm /> : null}
 
-      {/* ATTACHEMENT BLOCK */}
+      {/* ATTACHMENT BLOCK */}
       {block?.message && "attachment" in block?.message ? (
         <AttachmentMessageForm />
       ) : null}
diff --git a/frontend/src/services/api.class.ts b/frontend/src/services/api.class.ts
index fe466e5c..f1f6d99b 100644
--- a/frontend/src/services/api.class.ts
+++ b/frontend/src/services/api.class.ts
@@ -200,19 +200,19 @@ export class ApiClient {
     return data;
   }
 
-  async importNlpSamples(attachementId: string) {
+  async importNlpSamples(attachmentId: string) {
     const { _csrf } = await this.getCsrf();
     const { data } = await this.request.post(
-      `${ROUTES.NLP_SAMPLE_IMPORT}/${attachementId}`,
+      `${ROUTES.NLP_SAMPLE_IMPORT}/${attachmentId}`,
       { _csrf },
     );
 
     return data;
   }
 
-  async importContent(contentTypeId: string, attachementId: string) {
+  async importContent(contentTypeId: string, attachmentId: string) {
     const { data } = await this.request.get(
-      `${ROUTES.CONTENT_IMPORT}/${contentTypeId}/${attachementId}`,
+      `${ROUTES.CONTENT_IMPORT}/${contentTypeId}/${attachmentId}`,
     );
 
     return data;
diff --git a/frontend/src/types/message.types.ts b/frontend/src/types/message.types.ts
index 818151ee..a1b9dea6 100644
--- a/frontend/src/types/message.types.ts
+++ b/frontend/src/types/message.types.ts
@@ -38,7 +38,7 @@ export enum FileType {
   unknown = "unknown",
 }
 
-// Attachements
+// Attachments
 export interface AttachmentAttrs {
   name: string;
   type: string;