diff --git a/radare2 b/radare2
index 31f6d8ec..3c8d7d53 160000
--- a/radare2
+++ b/radare2
@@ -1 +1 @@
-Subproject commit 31f6d8ecaa78370688e089cbead3180c3cadf80b
+Subproject commit 3c8d7d53fa5cb438f7462ff2403b4dfe4d33ddef
diff --git a/src/Cutter.cpp b/src/Cutter.cpp
index bdaa19a3..186d1237 100644
--- a/src/Cutter.cpp
+++ b/src/Cutter.cpp
@@ -748,9 +748,9 @@ void CutterCore::setSettings()
     setConfig("asm.cmt.col", 70);
     setConfig("asm.xrefs", false);
 
-    setConfig("asm.tabsonce", true);
-    setConfig("asm.tabsoff", 5);
-    setConfig("asm.midflags", 2);
+    setConfig("asm.tabs.once", true);
+    setConfig("asm.tabs.off", 5);
+    setConfig("asm.flags.middle", 2);
 
     setConfig("anal.hasnext", false);
     setConfig("asm.lines.call", false);
diff --git a/src/dialogs/preferences/AsmOptionsWidget.cpp b/src/dialogs/preferences/AsmOptionsWidget.cpp
index 8b592d5f..596d5ba2 100644
--- a/src/dialogs/preferences/AsmOptionsWidget.cpp
+++ b/src/dialogs/preferences/AsmOptionsWidget.cpp
@@ -37,11 +37,11 @@ void AsmOptionsWidget::updateAsmOptionsFromVars()
     qhelpers::setCheckedWithoutSignals(ui->stackpointerCheckBox, Config()->getConfigBool("asm.stackptr"));
     qhelpers::setCheckedWithoutSignals(ui->slowCheckBox, Config()->getConfigBool("asm.slow"));
     qhelpers::setCheckedWithoutSignals(ui->linesCheckBox, Config()->getConfigBool("asm.lines"));
-    qhelpers::setCheckedWithoutSignals(ui->fcnlinesCheckBox, Config()->getConfigBool("asm.fcnlines"));
-    qhelpers::setCheckedWithoutSignals(ui->flgoffCheckBox, Config()->getConfigBool("asm.flgoff"));
+    qhelpers::setCheckedWithoutSignals(ui->fcnlinesCheckBox, Config()->getConfigBool("asm.lines.fcn"));
+    qhelpers::setCheckedWithoutSignals(ui->flgoffCheckBox, Config()->getConfigBool("asm.flags.offset"));
     qhelpers::setCheckedWithoutSignals(ui->emuCheckBox, Config()->getConfigBool("asm.emu"));
     qhelpers::setCheckedWithoutSignals(ui->cmtrightCheckBox, Config()->getConfigBool("asm.cmt.right"));
-    qhelpers::setCheckedWithoutSignals(ui->varsumCheckBox, Config()->getConfigBool("asm.varsum"));
+    qhelpers::setCheckedWithoutSignals(ui->varsumCheckBox, Config()->getConfigBool("asm.var.summary"));
     qhelpers::setCheckedWithoutSignals(ui->sizeCheckBox, Config()->getConfigBool("asm.size"));
 
     bool bytesEnabled = Config()->getConfigBool("asm.bytes");
@@ -148,13 +148,13 @@ void AsmOptionsWidget::on_linesCheckBox_toggled(bool checked)
 
 void AsmOptionsWidget::on_fcnlinesCheckBox_toggled(bool checked)
 {
-    Config()->setConfig("asm.fcnlines", checked);
+    Config()->setConfig("asm.lines.fcn", checked);
     triggerAsmOptionsChanged();
 }
 
 void AsmOptionsWidget::on_flgoffCheckBox_toggled(bool checked)
 {
-    Config()->setConfig("asm.flgoff", checked);
+    Config()->setConfig("asm.flags.off", checked);
     triggerAsmOptionsChanged();
 }
 
@@ -172,7 +172,7 @@ void AsmOptionsWidget::on_cmtrightCheckBox_toggled(bool checked)
 
 void AsmOptionsWidget::on_varsumCheckBox_toggled(bool checked)
 {
-    Config()->setConfig("asm.varsum", checked);
+    Config()->setConfig("asm.var.summary", checked);
     triggerAsmOptionsChanged();
 }
 
@@ -262,14 +262,14 @@ void AsmOptionsWidget::on_bblineCheckBox_toggled(bool checked)
 
 void AsmOptionsWidget::on_varsubCheckBox_toggled(bool checked)
 {
-    Config()->setConfig("asm.varsub", checked);
+    Config()->setConfig("asm.var.sub", checked);
     ui->varsubOnlyCheckBox->setEnabled(checked);
     triggerAsmOptionsChanged();
 }
 
 void AsmOptionsWidget::on_varsubOnlyCheckBox_toggled(bool checked)
 {
-    Config()->setConfig("asm.varsub_only", checked);
+    Config()->setConfig("asm.var.subonly", checked);
     triggerAsmOptionsChanged();
 }
 
diff --git a/src/dialogs/preferences/AsmOptionsWidget.ui b/src/dialogs/preferences/AsmOptionsWidget.ui
index 6130e78a..216139fe 100644
--- a/src/dialogs/preferences/AsmOptionsWidget.ui
+++ b/src/dialogs/preferences/AsmOptionsWidget.ui
@@ -17,7 +17,7 @@
    <item>
     <widget class="QTabWidget" name="asmOptionsTab">
      <property name="currentIndex">
-      <number>0</number>
+      <number>1</number>
      </property>
      <widget class="QWidget" name="asmStyleTab">
       <attribute name="title">
@@ -172,14 +172,14 @@
        <item>
         <widget class="QCheckBox" name="fcnlinesCheckBox">
          <property name="text">
-          <string>Show function boundary lines (asm.fcnlines)</string>
+          <string>Show function boundary lines (asm.lines.fcn)</string>
          </property>
         </widget>
        </item>
        <item>
         <widget class="QCheckBox" name="flgoffCheckBox">
          <property name="text">
-          <string>Show offset before flags (asm.flgoff)</string>
+          <string>Show offset before flags (asm.flags.off)</string>
          </property>
         </widget>
        </item>
@@ -207,7 +207,7 @@
        <item>
         <widget class="QCheckBox" name="varsumCheckBox">
          <property name="text">
-          <string>Show variables summary instead of full list (asm.varsum)</string>
+          <string>Show variables summary instead of full list (asm.var.summary)</string>
          </property>
         </widget>
        </item>
@@ -238,14 +238,14 @@
        <item>
         <widget class="QCheckBox" name="varsubCheckBox">
          <property name="text">
-          <string>Substitute variables (asm.varsub)</string>
+          <string>Substitute variables (asm.var.sub)</string>
          </property>
         </widget>
        </item>
        <item>
         <widget class="QCheckBox" name="varsubOnlyCheckBox">
          <property name="text">
-          <string>Substitute entire variable expressions with names (asm.varsub_only)</string>
+          <string>Substitute entire variable expressions with names (asm.var.subonly)</string>
          </property>
         </widget>
        </item>
diff --git a/src/utils/Configuration.cpp b/src/utils/Configuration.cpp
index 6924ff81..de2cd96a 100644
--- a/src/utils/Configuration.cpp
+++ b/src/utils/Configuration.cpp
@@ -18,11 +18,11 @@ static const QHash<QString, QVariant> asmOptions = {
     { "asm.stackptr",       false },
     { "asm.slow",           true },
     { "asm.lines",          true },
-    { "asm.fcnlines",       true },
-    { "asm.flgoff",         false },
+    { "asm.lines.fcn",      true },
+    { "asm.flags.offset",   false },
     { "asm.emu",            false },
     { "asm.cmt.right",      true },
-    { "asm.varsum",         false },
+    { "asm.var.summary",    false },
     { "asm.bytes",          false },
     { "asm.size",           false },
     { "asm.bytespace",      false },
@@ -32,8 +32,8 @@ static const QHash<QString, QVariant> asmOptions = {
     { "asm.ucase",          false },
     { "asm.bbline",         false },
     { "asm.capitalize",     false },
-    { "asm.varsub",         true },
-    { "asm.varsub_only",    true },
+    { "asm.var.sub",        true },
+    { "asm.var.subonly",    true },
     { "asm.tabs",           5 }
 };
 
diff --git a/src/widgets/DisassemblerGraphView.cpp b/src/widgets/DisassemblerGraphView.cpp
index b8b8ee37..747ea825 100644
--- a/src/widgets/DisassemblerGraphView.cpp
+++ b/src/widgets/DisassemblerGraphView.cpp
@@ -124,7 +124,7 @@ void DisassemblerGraphView::loadCurrentGraph()
     .set("scr.color", COLOR_MODE_16M)
     .set("asm.bbline", false)
     .set("asm.lines", false)
-    .set("asm.fcnlines", false);
+    .set("asm.lines.fcn", false);
     QJsonDocument functionsDoc = Core()->cmdj("agJ");
     QJsonArray functions = functionsDoc.array();