diff --git a/lang/en/events/github/issues.php b/lang/en/events/github/issues.php
index 7beb0f4..87cff4a 100644
--- a/lang/en/events/github/issues.php
+++ b/lang/en/events/github/issues.php
@@ -12,15 +12,15 @@
         'title' => '⚠️ <b>Issue has been edited</b> to 🦑 :issue by :user',
         'changes' => [
             'title' => [
-                'title' => '📖 <b>Title</b> has been changed',
-                'from' => '    📝 <b>From:</b> :title_from',
-                'to' => '    🏷 <b>To:</b> :title_to',
+                'name' => '📖 <b>Title</b> has been changed',
+                'from' => '📝 <b>From:</b> :title_from',
+                'to' => '🏷 <b>To:</b> :title_to',
             ],
             'body' => [
                 'title' => '📖 <b>Body</b> has been changed',
-                'body' => 'Please check the issue for more details',
-            ]
-        ]
+                'message' => 'Please check the issue for more details',
+            ],
+        ],
     ],
     'locked' => [
         'title' => '🔒 <b>Issue Locked</b> form 🦑 :issue by :user',
diff --git a/lang/en/events/shared/github.php b/lang/en/events/shared/github.php
index 782d6b6..ce3f29f 100644
--- a/lang/en/events/shared/github.php
+++ b/lang/en/events/shared/github.php
@@ -4,4 +4,7 @@
     '_body' => [
         'title' => '📖 <b>Content:</b>',
     ],
+    '_assignee' => [
+        'title' => '🙋 Assignee: ',
+    ],
 ];
diff --git a/resources/views/events/github/issues/edited.blade.php b/resources/views/events/github/issues/edited.blade.php
index a983584..719f159 100644
--- a/resources/views/events/github/issues/edited.blade.php
+++ b/resources/views/events/github/issues/edited.blade.php
@@ -16,12 +16,11 @@
 {!! __('tg-notifier::events/github/issues.issue_title') !!} <b><?= $issue->title; ?></b>
 
 @include('tg-notifier::events.shared.partials.github._assignees', compact('payload', 'event'))
-
 @if(isset($payload->changes->title))
-    {!! __('tg-notifier::events/github/issues.edited.changes.title.title') !!}
-    {!! __('tg-notifier::events/github/issues.edited.changes.title.from', ['title_from' => $payload->changes->title->from]) !!}
-    {!! __('tg-notifier::events/github/issues.edited.changes.title.to', ['title_to' => $payload->issue->title]) !!}
+{!! __('tg-notifier::events/github/issues.edited.changes.title.name')!!}
+    {!! __('tg-notifier::events/github/issues.edited.changes.title.from', ['title_from' => $payload->changes->title->from])!!}
+    {!! __('tg-notifier::events/github/issues.edited.changes.title.to', ['title_to' => $payload->issue->title])!!}
 @elseif(isset($payload->changes->body))
-    {!! __('tg-notifier::events/github/issues.edited.changes.body.title')!!}
-    {!! __('tg-notifier::events/github/issues.edited.changes.body.body')!!}
+{!! __('tg-notifier::events/github/issues.edited.changes.body.title')!!}
+{!! __('tg-notifier::events/github/issues.edited.changes.body.message')!!}
 @endif
diff --git a/resources/views/events/shared/partials/github/_assignees.blade.php b/resources/views/events/shared/partials/github/_assignees.blade.php
index 6220e0a..6fa61b0 100644
--- a/resources/views/events/shared/partials/github/_assignees.blade.php
+++ b/resources/views/events/shared/partials/github/_assignees.blade.php
@@ -5,7 +5,7 @@
  */
 
 if (isset($event) && isset($payload) && !empty($payload->{$event}->assignees)) {
-    $assigneeText = "🙋 Assignee: ";
+    $assigneeText = __('tg-notifier::events/shared/github._assignee.title');
     $assigneeArray = [];
     foreach ($payload->{$event}->assignees as $assignee) {
         $assigneeArray[] = "<a href=\"{$assignee->html_url}\">@{$assignee->login}</a> ";