diff --git a/lib/src/controllers/chat/ds_video_message_bubble.controller.dart b/lib/src/controllers/chat/ds_video_message_bubble.controller.dart
index c67d380a..67226437 100644
--- a/lib/src/controllers/chat/ds_video_message_bubble.controller.dart
+++ b/lib/src/controllers/chat/ds_video_message_bubble.controller.dart
@@ -40,7 +40,7 @@ class DSVideoMessageBubbleController {
             mediaSize,
             precision: PrecisionValue.One,
           )
-        : 'message.download'.translate();
+        : 'video.download'.translate();
   }
 
   Future<void> getStoredVideo() async {
@@ -115,8 +115,8 @@ class DSVideoMessageBubbleController {
 
       DSToastService.error(
         DSToastProps(
-          title: 'message.download-title-error'.translate(),
-          message: 'message.download-message-error'.translate(),
+          title: 'video.download-title-error'.translate(),
+          message: 'video.download-message-error'.translate(),
         ),
       );
     } finally {
diff --git a/lib/src/widgets/chat/ds_delivery_report_icon.widget.dart b/lib/src/widgets/chat/ds_delivery_report_icon.widget.dart
index af443869..9f216776 100644
--- a/lib/src/widgets/chat/ds_delivery_report_icon.widget.dart
+++ b/lib/src/widgets/chat/ds_delivery_report_icon.widget.dart
@@ -35,7 +35,7 @@ class DSDeliveryReportIcon extends StatelessWidget {
 
       case DSDeliveryReportStatus.failed:
         return DSCaptionSmallText(
-          'message.send-fail'.translate(),
+          'delivery.send-fail'.translate(),
           color: DSColors.actionColorNegative,
         );
 
diff --git a/lib/src/widgets/chat/ds_location_message_bubble.widget.dart b/lib/src/widgets/chat/ds_location_message_bubble.widget.dart
index d1ec2dbc..e7706d2c 100644
--- a/lib/src/widgets/chat/ds_location_message_bubble.widget.dart
+++ b/lib/src/widgets/chat/ds_location_message_bubble.widget.dart
@@ -156,7 +156,7 @@ class _DSLocationMessageBubbleState extends State<DSLocationMessageBubble> {
               mainAxisAlignment: MainAxisAlignment.spaceBetween,
               children: [
                 DSHeadlineLargeText(
-                  'message.select-action'.translate(),
+                  'location.select-action'.translate(),
                 ),
                 DSIconButton(
                   onPressed: () {
@@ -198,7 +198,7 @@ class _DSLocationMessageBubbleState extends State<DSLocationMessageBubble> {
                       Get.back();
                     },
                     title: DSBodyText(
-                      "message.open-with".translate() + " ${map.mapName}",
+                      "location.open-with".translate() + " ${map.mapName}",
                     ),
                   );
                 },
diff --git a/lib/src/widgets/chat/ds_reply_container.widget.dart b/lib/src/widgets/chat/ds_reply_container.widget.dart
index b7ab325e..33685cd3 100644
--- a/lib/src/widgets/chat/ds_reply_container.widget.dart
+++ b/lib/src/widgets/chat/ds_reply_container.widget.dart
@@ -53,7 +53,7 @@ class DSReplyContainer extends StatelessWidget {
             ),
             const SizedBox(width: 8.0),
             DSCaptionText(
-              'message.reply'.translate(),
+              'reply.text'.translate(),
               fontStyle: FontStyle.italic,
               color: style.isLightBubbleBackground(align)
                   ? DSColors.neutralDarkCity
@@ -153,7 +153,7 @@ class DSReplyContainer extends StatelessWidget {
           const SizedBox(width: 8.0),
           Flexible(
             child: DSBodyText(
-              'message.load-fail'.translate(),
+              'reply.load-fail'.translate(),
               overflow: TextOverflow.visible,
               color: _foregroundColor,
             ),
diff --git a/lib/src/widgets/chat/ds_request_location_bubble.widget.dart b/lib/src/widgets/chat/ds_request_location_bubble.widget.dart
index c8ba1594..342e1191 100644
--- a/lib/src/widgets/chat/ds_request_location_bubble.widget.dart
+++ b/lib/src/widgets/chat/ds_request_location_bubble.widget.dart
@@ -57,7 +57,7 @@ class DSRequestLocationBubble extends StatelessWidget {
               ),
             if (showRequestLocationButton)
               DSRequestLocationButton(
-                label: 'message.send-location'.translate(),
+                label: 'location.send'.translate(),
               ),
           ],
         ),
diff --git a/lib/src/widgets/chat/ds_show_more_text.widget.dart b/lib/src/widgets/chat/ds_show_more_text.widget.dart
index 0e45c6da..e06ef403 100644
--- a/lib/src/widgets/chat/ds_show_more_text.widget.dart
+++ b/lib/src/widgets/chat/ds_show_more_text.widget.dart
@@ -72,7 +72,7 @@ class DSShowMoreText extends StatelessWidget {
                 child: GestureDetector(
                   onTap: () => shouldShowFullText.value = true,
                   child: DSBodyText(
-                    'message.show-more'.translate(),
+                    'show-more.text'.translate(),
                     color: isLightBubbleBackground
                         ? isDefaultBubbleColors
                             ? DSColors.primaryNight
diff --git a/lib/src/widgets/chat/ds_survey_message_bubble.widget.dart b/lib/src/widgets/chat/ds_survey_message_bubble.widget.dart
index dcfdddc4..38bb7e41 100644
--- a/lib/src/widgets/chat/ds_survey_message_bubble.widget.dart
+++ b/lib/src/widgets/chat/ds_survey_message_bubble.widget.dart
@@ -110,19 +110,19 @@ class DSSurveyMessageBubble extends StatelessWidget {
   _getTitlePreview() {
     switch (type) {
       case DSSurveyType.recommendation:
-        return "message.survey-recommendation".translate();
+        return "survey.recommendation".translate();
       case DSSurveyType.solution:
-        return 'message.survey-solution'.translate();
+        return 'survey-solution'.translate();
       case DSSurveyType.chatbot:
-        return 'message.survey-chatbot'.translate();
+        return 'survey-chatbot'.translate();
     }
   }
 
   _getDescriptionPreview(bool positiveLabel) => positiveLabel
       ? type == DSSurveyType.recommendation
-          ? 'message.survey-recommendation-answered-positive'.translate()
-          : 'message.survey-positive'.translate()
+          ? 'survey-recommendation-answered-positive'.translate()
+          : 'survey-positive'.translate()
       : type == DSSurveyType.recommendation
-          ? "message.survey-recommendation-answered-negative".translate()
-          : 'message.survey-negative'.translate();
+          ? "survey-recommendation-answered-negative".translate()
+          : 'survey-negative'.translate();
 }
diff --git a/lib/src/widgets/chat/ds_unsupported_content_message_bubble.widget.dart b/lib/src/widgets/chat/ds_unsupported_content_message_bubble.widget.dart
index 849b23a3..98daff98 100644
--- a/lib/src/widgets/chat/ds_unsupported_content_message_bubble.widget.dart
+++ b/lib/src/widgets/chat/ds_unsupported_content_message_bubble.widget.dart
@@ -56,7 +56,7 @@ class DSUnsupportedContentMessageBubble extends StatelessWidget {
             child: Padding(
               padding: const EdgeInsets.only(left: 8.0),
               child: DSBodyText(
-                text ?? 'message.unsupported'.translate(),
+                text ?? 'unsupported-content.text'.translate(),
                 color: color,
                 overflow: overflow,
               ),
diff --git a/lib/src/widgets/chat/video/ds_video_error.dialog.dart b/lib/src/widgets/chat/video/ds_video_error.dialog.dart
index ed8269c9..a4b173a2 100644
--- a/lib/src/widgets/chat/video/ds_video_error.dialog.dart
+++ b/lib/src/widgets/chat/video/ds_video_error.dialog.dart
@@ -16,8 +16,8 @@ abstract class DSVideoErrorDialog {
     final Map<String, String?>? httpHeaders,
   }) async {
     await DSDialogService(
-      title: 'message.error-video-reproduction-title'.translate(),
-      text: 'message.error-video-reproduction-message'.translate(),
+      title: 'video-error.reproduction-title'.translate(),
+      text: 'video-error.reproduction-message'.translate(),
       primaryButton: DSPrimaryButton(
           onPressed: () async {
             Get.back();
diff --git a/test/widgets/chat/ds_chat_test.dart b/test/widgets/chat/ds_chat_test.dart
index 3753b0c9..664a155d 100644
--- a/test/widgets/chat/ds_chat_test.dart
+++ b/test/widgets/chat/ds_chat_test.dart
@@ -34,7 +34,7 @@ void main() {
           await tester.pumpWidgetBuilder(messages);
 
           final Finder findMessage = find.text(
-            'message.send-fail'.translate(),
+            'delivery.send-fail'.translate(),
             findRichText: true,
           );