diff --git a/attachments_component/site/src/Helper/AttachmentsHelper.php b/attachments_component/site/src/Helper/AttachmentsHelper.php
index c5af71de..ddb8f05a 100644
--- a/attachments_component/site/src/Helper/AttachmentsHelper.php
+++ b/attachments_component/site/src/Helper/AttachmentsHelper.php
@@ -2001,7 +2001,7 @@ public static function attachmentButtonsHTML($parent_type, $parent_id, $parent_e
         $a_class = 'modal-button mx-2';
         $tooltip = $add_attachment_txt;
 
-        $randomId = base64_encode('add');
+        $randomId = base64_encode('add' . $parent_id);
         // Remove +,/,= from the $randomId
         $randomId = strtr($randomId, "+/=", "AAA");
         $modalParams['title']  = $tooltip === null ? '' : htmlspecialchars($tooltip, ENT_QUOTES, 'UTF-8');
diff --git a/attachments_component/site/tmpl/attachments/default.php b/attachments_component/site/tmpl/attachments/default.php
index c7d91db5..569dfbbb 100644
--- a/attachments_component/site/tmpl/attachments/default.php
+++ b/attachments_component/site/tmpl/attachments/default.php
@@ -241,7 +241,7 @@
             $a_class = 'modal-button';
             AttachmentsJavascript::setupModalJavascript();
 
-            $randomId = base64_encode('show' . $actual_filename);
+            $randomId = base64_encode('show' . $attachment->id . $actual_filename);
             // Remove +,/,= from the $randomId
             $randomId = strtr($randomId, "+/=", "AAA");
             $modalParams['title']  = $this->escape($tooltip);
@@ -459,7 +459,7 @@
         $update_url = str_replace('%d', (string)$attachment->id, $this->update_url);
         $tooltip = Text::_('ATTACH_UPDATE_THIS_FILE') . ' (' . $actual_filename . ')';
 
-        $randomId = base64_encode('update' . $actual_filename);
+        $randomId = base64_encode('update' . $attachment->id . $actual_filename);
         // Remove +,/,= from the $randomId
         $randomId = strtr($randomId, "+/=", "AAA");
         $modalParams['title']  = $this->escape($tooltip);
@@ -493,7 +493,7 @@
         $delete_url = str_replace('%d', (string)$attachment->id, $this->delete_url);
         $tooltip = Text::_('ATTACH_DELETE_THIS_FILE') . ' (' . $actual_filename . ')';
 
-        $randomId = base64_encode('delete' . $actual_filename);
+        $randomId = base64_encode('delete' . $attachment->id . $actual_filename);
         // Remove +,/,= from the $randomId
         $randomId = strtr($randomId, "+/=", "AAA");
         $modalParams['title']  = $this->escape($tooltip);
diff --git a/attachments_for_content/language/el-GR/el-GR.plg_attachments_attachments_for_content.sys.ini b/attachments_for_content/language/el-GR/el-GR.plg_attachments_attachments_for_content.sys.ini
index c0cc1e8c..064432d8 100644
--- a/attachments_for_content/language/el-GR/el-GR.plg_attachments_attachments_for_content.sys.ini
+++ b/attachments_for_content/language/el-GR/el-GR.plg_attachments_attachments_for_content.sys.ini
@@ -7,4 +7,4 @@
 ; Greek translation
 
 ATTACH_ATTACHMENTS_FOR_CONTENT_PLUGIN_DESCRIPTION="Το πρόσθετο Συνημμένα για το Περιεχόμενο κάνει δυνατή την προσθήκη συνημμένων σε άρθρα καθώς και στις περιγραφές κατηγοριών."
-PLG_ATTACHMENTS_FOR_CONTENT="Συνημμένα - Για Περιεχόμενο"
+PLG_ATTACHMENTS_ATTACHMENTS_FOR_CONTENT="Συνημμένα - Για Περιεχόμενο"
diff --git a/attachments_for_content/language/en-GB/en-GB.plg_attachments_attachments_for_content.sys.ini b/attachments_for_content/language/en-GB/en-GB.plg_attachments_attachments_for_content.sys.ini
index 58458dc7..a38dba88 100644
--- a/attachments_for_content/language/en-GB/en-GB.plg_attachments_attachments_for_content.sys.ini
+++ b/attachments_for_content/language/en-GB/en-GB.plg_attachments_attachments_for_content.sys.ini
@@ -7,4 +7,4 @@
 ; English translation
 
 ATTACH_ATTACHMENTS_FOR_CONTENT_PLUGIN_DESCRIPTION="The Attachments for Content plugin enables adding attachments to content articles as well as category descriptions."
-PLG_ATTACHMENTS_FOR_CONTENT="Attachments - For Content"
+PLG_ATTACHMENTS_ATTACHMENTS_FOR_CONTENT="Attachments - For Content"
diff --git a/attachments_for_content/language/fr-FR/fr-FR.plg_attachments_attachments_for_content.sys.ini b/attachments_for_content/language/fr-FR/fr-FR.plg_attachments_attachments_for_content.sys.ini
index ba245e77..1d2cd6ed 100644
--- a/attachments_for_content/language/fr-FR/fr-FR.plg_attachments_attachments_for_content.sys.ini
+++ b/attachments_for_content/language/fr-FR/fr-FR.plg_attachments_attachments_for_content.sys.ini
@@ -7,4 +7,4 @@
 ; French translation by: Marc-André Ladouceur (2.0), Pascal Adalian and Sylvain Faivre
 
 ATTACH_ATTACHMENTS_FOR_CONTENT_PLUGIN_DESCRIPTION="Ce plugin permet l'ajout de pièces-jointes au contenu des articles et à la description des catégories."
-PLG_ATTACHMENTS_FOR_CONTENT="Pièces jointes - Pour contenu"
+PLG_ATTACHMENTS_ATTACHMENTS_FOR_CONTENT="Pièces jointes - Pour contenu"