diff --git a/src/cutter.cpp b/src/cutter.cpp
index 5add3a9f..91e28a5a 100644
--- a/src/cutter.cpp
+++ b/src/cutter.cpp
@@ -314,10 +314,15 @@ void CutterCore::analyze(int level,  QList<QString> advanced)
     }
 }
 
-void CutterCore::renameFunction(QString prev_name, QString new_name)
+void CutterCore::renameFunction(QString old_name, QString new_name)
 {
-    cmd("afn " + new_name + " " + prev_name);
-    emit functionRenamed(prev_name, new_name);
+    cmd("afn " + new_name + " " + old_name);
+    emit functionRenamed(old_name, new_name);
+}
+
+void CutterCore::renameFlag(QString old_name, QString new_name)
+{
+    cmd("fr " + old_name + " " + new_name);
 }
 
 void CutterCore::setComment(RVA addr, QString cmt)
diff --git a/src/cutter.h b/src/cutter.h
index 844f1473..b6a6a6fc 100644
--- a/src/cutter.h
+++ b/src/cutter.h
@@ -200,6 +200,7 @@ public:
     QJsonDocument cmdj(const QString &str);
     QStringList cmdList(const QString &str)     { auto l = cmd(str).split("\n"); l.removeAll(""); return l; }
     void renameFunction(QString prev_name, QString new_name);
+    void renameFlag(QString old_name, QString new_name);
     void setComment(RVA addr, QString cmt);
     void delComment(ut64 addr);
     QMap<QString, QList<QList<QString>>> getNestedComments();
diff --git a/src/dialogs/RenameDialog.ui b/src/dialogs/RenameDialog.ui
index 5e5f7fe4..271f6014 100644
--- a/src/dialogs/RenameDialog.ui
+++ b/src/dialogs/RenameDialog.ui
@@ -40,7 +40,7 @@
      <item>
       <widget class="QLabel" name="nameLabel">
        <property name="text">
-        <string>Function name:</string>
+        <string>Name:</string>
        </property>
       </widget>
      </item>
diff --git a/src/menus/DisassemblyContextMenu.cpp b/src/menus/DisassemblyContextMenu.cpp
index e2f923f9..722801de 100644
--- a/src/menus/DisassemblyContextMenu.cpp
+++ b/src/menus/DisassemblyContextMenu.cpp
@@ -172,7 +172,7 @@ void DisassemblyContextMenu::on_actionRename_triggered()
             dialog->setName(f->name);
             if (dialog->exec()) {
                 QString new_name = dialog->getName();
-                Core()->renameFunction(f->name, new_name);
+                Core()->renameFlag(f->name, new_name);
             }
         } else {
             /* Create new flag */