diff --git a/src/app/constant/JamiStrings.qml b/src/app/constant/JamiStrings.qml
index ed5996f3f4f133b5543008fb47c9cf059ae3f08e..6278cb033cddbbabf0ca7d3809e70b06ba0991c1 100644
--- a/src/app/constant/JamiStrings.qml
+++ b/src/app/constant/JamiStrings.qml
@@ -796,13 +796,13 @@ Item {
 
     property string bold: qsTr("Bold")
     property string italic: qsTr("Italic")
-    property string barre: qsTr("Strikethrough")
+    property string strikethrough: qsTr("Strikethrough")
     property string title: qsTr("Title")
     property string link: qsTr("Link")
     property string code: qsTr("Code")
     property string quote: qsTr("Quote")
-    property string bulletPoint: qsTr("Bullet Point")
-    property string bulletNumber: qsTr("Bullet Number")
+    property string unorderedList: qsTr("Unordered list")
+    property string orderedList: qsTr("Ordered list")
     property string showFormating: qsTr("Show Formating")
     property string hideFormating: qsTr("Hide Formating")
 
diff --git a/src/app/mainview/components/KeyboardShortcutTable.qml b/src/app/mainview/components/KeyboardShortcutTable.qml
index 49ea293a6923a9b45b14a5e7035f04f61ec95c91..187e590b54904b6fc087d4d86a62a5629613dd5b 100644
--- a/src/app/mainview/components/KeyboardShortcutTable.qml
+++ b/src/app/mainview/components/KeyboardShortcutTable.qml
@@ -248,12 +248,12 @@ Window {
         ListElement {
             shortcut: "Shift + Alt + 8"
             shortcut2: ""
-            description: qsTr("Bulleted List")
+            description: qsTr("Unordered list")
         }
         ListElement {
             shortcut: "Shift + Alt + 7"
             shortcut2: ""
-            description: qsTr("Numbered List")
+            description: qsTr("Ordered list")
         }
     }
 
diff --git a/src/app/mainview/components/MessageBar.qml b/src/app/mainview/components/MessageBar.qml
index cd870e2091bb3044f4d484accf64bf4de29859c6..0765f184232117b0eac0d7aad898509ac6eb5fdc 100644
--- a/src/app/mainview/components/MessageBar.qml
+++ b/src/app/mainview/components/MessageBar.qml
@@ -105,10 +105,10 @@ ColumnLayout {
             "Quote": function () {
                 listViewTypoSecond.itemAtIndex(2).action.triggered();
             },
-            "Bulleted List": function () {
+            "Unordered list": function () {
                 listViewTypoSecond.itemAtIndex(3).action.triggered();
             },
-            "Numbered List": function () {
+            "Ordered list": function () {
                 listViewTypoSecond.itemAtIndex(4).action.triggered();
             }
         }
@@ -158,13 +158,13 @@ ColumnLayout {
         Shortcut {
             sequence: "Shift+Alt+8"
             context: Qt.ApplicationShortcut
-            onActivated: textArea.markdownShortCut["Bulleted List"]()
+            onActivated: textArea.markdownShortCut["Unordered list"]()
         }
 
         Shortcut {
             sequence: "Shift+Alt+7"
             context: Qt.ApplicationShortcut
-            onActivated: textArea.markdownShortCut["Numbered List"]()
+            onActivated: textArea.markdownShortCut["Ordered list"]()
         }
     }
 
@@ -249,7 +249,7 @@ ColumnLayout {
                         }
                     }
 
-                    function addPrefixStyle(message, selectionStart, selectionEnd, delimiter, isBulletNumber) {
+                    function addPrefixStyle(message, selectionStart, selectionEnd, delimiter, isOrderedList) {
 
                         //represents all the selected lines
                         var multilineSelection;
@@ -304,7 +304,7 @@ ColumnLayout {
                         var count;
                         var startPos;
                         var multilineSelectionLength;
-                        if (!isBulletNumber) {
+                        if (!isOrderedList) {
                             if (getHasCurrentMarkdown()) {
 
                                 // clear first line from delimiter
@@ -420,9 +420,9 @@ ColumnLayout {
                                 }
                             },
                             Action {
-                                id: barreAction
+                                id: strikethroughAction
                                 property var iconSrc: JamiResources.s_barre_black_24dp_svg
-                                property var shortcutText: JamiStrings.barre
+                                property var shortcutText: JamiStrings.strikethrough
                                 property string shortcutKey: "Shift+Alt+X"
                                 onTriggered: function clickAction() {
                                     listViewTypo.addStyle(root.text, textArea.selectionStart, textArea.selectionEnd, "~~", "~~");
@@ -595,18 +595,18 @@ ColumnLayout {
                                 }
                             },
                             Action {
-                                id: bulletPointAction
+                                id: unorderedListAction
                                 property var iconSrc: JamiResources.bullet_point_black_24dp_svg
-                                property var shortcutText: JamiStrings.bulletPoint
+                                property var shortcutText: JamiStrings.unorderedList
                                 property string shortcutKey: "Shift+Alt+8"
                                 onTriggered: function clickAction() {
                                     listViewTypo.addPrefixStyle(root.text, textArea.selectionStart, textArea.selectionEnd, "- ", false);
                                 }
                             },
                             Action {
-                                id: bulletNumberAction
+                                id: orderedListAction
                                 property var iconSrc: JamiResources.bullet_number_black_24dp_svg
-                                property var shortcutText: JamiStrings.bulletNumber
+                                property var shortcutText: JamiStrings.orderedList
                                 property string shortcutKey: "Shift+Alt+7"
                                 onTriggered: function clickAction() {
                                     listViewTypo.addPrefixStyle(root.text, textArea.selectionStart, textArea.selectionEnd, "", true);