diff --git a/ts/test/types/Attachment_test.ts b/ts/test/types/Attachment_test.ts
index 3e219c2695e..211023c2c70 100644
--- a/ts/test/types/Attachment_test.ts
+++ b/ts/test/types/Attachment_test.ts
@@ -49,7 +49,7 @@ describe('Attachment', () => {
           attachment,
           timestamp,
         });
-        const expected = 'signal-attachment-1970-01-01-000000.mov';
+        const expected = 'signal-1970-01-01-000000.mov';
         assert.strictEqual(actual, expected);
       });
     });
@@ -65,7 +65,7 @@ describe('Attachment', () => {
           timestamp,
           index: 3,
         });
-        const expected = 'signal-attachment-1970-01-01-000000_003.mov';
+        const expected = 'signal-1970-01-01-000000_003.mov';
         assert.strictEqual(actual, expected);
       });
     });
diff --git a/ts/types/Attachment.ts b/ts/types/Attachment.ts
index 9ffe8d6087b..3a557ea2f9d 100644
--- a/ts/types/Attachment.ts
+++ b/ts/types/Attachment.ts
@@ -374,7 +374,7 @@ export const getSuggestedFilename = ({
     return attachment.fileName;
   }
 
-  const prefix = 'signal-attachment';
+  const prefix = 'signal';
   const suffix = timestamp
     ? moment(timestamp).format('-YYYY-MM-DD-HHmmss')
     : '';