diff --git a/.travis.yml b/.travis.yml
index c55e926f..5d054063 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -81,6 +81,10 @@ matrix:
     osx_image: xcode11
     env: BUILD_SYSTEM=cmake
     before_install: ~
+    addons:
+      homebrew:
+        brewfile: scripts/Brewfile
+        update: true # updating brew to get slightly newer meson, 0.54 doesn't work on macOS.
 
   - name: Documentation + Deploy
     os: linux
diff --git a/radare2 b/radare2
index 4c9bf991..9d7eda5e 160000
--- a/radare2
+++ b/radare2
@@ -1 +1 @@
-Subproject commit 4c9bf99134bccb8a1f23b2753efffad4bc090388
+Subproject commit 9d7eda5ec7367d1682e489e92d1be8e37e459296
diff --git a/src/common/Configuration.cpp b/src/common/Configuration.cpp
index c0f7b37c..da0942d3 100644
--- a/src/common/Configuration.cpp
+++ b/src/common/Configuration.cpp
@@ -115,7 +115,7 @@ static const QHash<QString, QVariant> asmOptions = {
     { "asm.var.summary",    false },
     { "asm.bytes",          false },
     { "asm.size",           false },
-    { "asm.bytespace",      false },
+    { "asm.bytes.space",    false },
     { "asm.lbytes",         true },
     { "asm.nbytes",         10 },
     { "asm.syntax",         "intel" },
@@ -123,7 +123,7 @@ static const QHash<QString, QVariant> asmOptions = {
     { "asm.bb.line",        false },
     { "asm.capitalize",     false },
     { "asm.var.sub",        true },
-    { "asm.var.subonly",    true },
+    { "asm.sub.varonly",    true },
     { "asm.tabs",           8 },
     { "asm.tabs.off",       5 },
     { "asm.marks",          false },
diff --git a/src/common/SettingsUpgrade.cpp b/src/common/SettingsUpgrade.cpp
index 500747ae..aa444747 100644
--- a/src/common/SettingsUpgrade.cpp
+++ b/src/common/SettingsUpgrade.cpp
@@ -28,7 +28,7 @@ static bool migrateSettingsPre18(QSettings &newSettings)
     return true;
 }
 
-#define CUTTER_SETTINGS_VERSION_CURRENT 3
+#define CUTTER_SETTINGS_VERSION_CURRENT 4
 #define CUTTER_SETTINGS_VERSION_KEY     "version"
 
 /*
@@ -103,6 +103,18 @@ static void migrateSettingsTo3(QSettings &settings) {
     settings.remove("unsync");
 }
 
+static void migrateSettingsTo4(QSettings &settings) {
+    auto renameAsmOption = [&](QString oldName, QString newName) {
+          if (settings.contains(oldName)) {
+              auto value = settings.value(oldName);
+              settings.remove(oldName);
+              settings.setValue(newName, value);
+          }
+    };
+    renameAsmOption("asm.var.subonly", "asm.sub.varonly");
+    renameAsmOption("asm.bytespace", "asm.bytes.space");
+}
+
 void Cutter::initializeSettings()
 {
     QSettings::setDefaultFormat(QSettings::IniFormat);
@@ -126,6 +138,8 @@ void Cutter::initializeSettings()
                     migrateSettingsTo2(settings); break;
                 case 3:
                     migrateSettingsTo3(settings); break;
+                case 4:
+                    migrateSettingsTo4(settings); break;
                 default:
                     break;
                 }
diff --git a/src/dialogs/preferences/AsmOptionsWidget.cpp b/src/dialogs/preferences/AsmOptionsWidget.cpp
index 11bc0fd2..cdef5f85 100644
--- a/src/dialogs/preferences/AsmOptionsWidget.cpp
+++ b/src/dialogs/preferences/AsmOptionsWidget.cpp
@@ -27,9 +27,9 @@ AsmOptionsWidget::AsmOptionsWidget(PreferencesDialog *dialog)
         { ui->xrefCheckBox,         "asm.xrefs" },
         { ui->bblineCheckBox,       "asm.bb.line" },
         { ui->varsubCheckBox,       "asm.var.sub" },
-        { ui->varsubOnlyCheckBox,   "asm.var.subonly" },
+        { ui->varsubOnlyCheckBox,   "asm.sub.varonly" },
         { ui->lbytesCheckBox,       "asm.lbytes" },
-        { ui->bytespaceCheckBox,    "asm.bytespace" },
+        { ui->bytespaceCheckBox,    "asm.bytes.space" },
         { ui->bytesCheckBox,        "asm.bytes" },
         { ui->xrefCheckBox,         "asm.xrefs" },
         { ui->indentCheckBox,       "asm.indent" },
diff --git a/src/dialogs/preferences/AsmOptionsWidget.ui b/src/dialogs/preferences/AsmOptionsWidget.ui
index d9934ae5..139d0889 100644
--- a/src/dialogs/preferences/AsmOptionsWidget.ui
+++ b/src/dialogs/preferences/AsmOptionsWidget.ui
@@ -220,7 +220,7 @@
                 <item row="19" column="1" colspan="2">
                  <widget class="QCheckBox" name="bytespaceCheckBox">
                   <property name="text">
-                   <string>Separate bytes with whitespace (asm.bytespace)</string>
+                   <string>Separate bytes with whitespace (asm.bytes.space)</string>
                   </property>
                  </widget>
                 </item>
@@ -479,7 +479,7 @@
              <item>
               <widget class="QCheckBox" name="varsubOnlyCheckBox">
                <property name="text">
-                <string>Substitute entire variable expressions with names (asm.var.subonly)</string>
+                <string>Substitute entire variable expressions with names (asm.sub.varonly)</string>
                </property>
               </widget>
              </item>