diff --git a/gui/launcher.lua b/gui/launcher.lua
index 41bbdf092f..cf6a2942fc 100644
--- a/gui/launcher.lua
+++ b/gui/launcher.lua
@@ -40,7 +40,7 @@ local function get_default_tag_filter()
     if not dev_mode then
         ret.excludes.dev = true
         ret.excludes.unavailable = true
-        if dfhack.getHideArmokTools() then
+        if dfhack.getMortalMode() then
             ret.excludes.armok = true
         end
     end
@@ -61,7 +61,7 @@ local function toggle_dev_mode()
     tag_filter.excludes.unavailable = dev_mode or nil
     if not dev_mode then
         tag_filter.excludes.armok = nil
-    elseif dfhack.getHideArmokTools() then
+    elseif dfhack.getMortalMode() then
         tag_filter.excludes.armok = true
     end
     dev_mode = not dev_mode
@@ -1000,7 +1000,7 @@ local function add_top_related_entries(entries, entry, n)
     local dev_ok = dev_mode or helpdb.get_entry_tags(entry).dev
     local tags = helpdb.get_entry_tags(entry)
     local affinities, buckets = {}, {}
-    local skip_armok = dfhack.getHideArmokTools()
+    local skip_armok = dfhack.getMortalMode()
     for tag in pairs(tags) do
         for _,peer in ipairs(helpdb.get_tag_data(tag)) do
             if not skip_armok or not helpdb.get_entry_tags(peer).armok then
diff --git a/internal/control-panel/common.lua b/internal/control-panel/common.lua
index 789931064b..a7b08a0c34 100644
--- a/internal/control-panel/common.lua
+++ b/internal/control-panel/common.lua
@@ -94,7 +94,7 @@ function command_passes_filters(data, target_group, filter_strs)
     end
     filter_strs = filter_strs or {}
     local first_word = get_first_word(data.help_command or data.command)
-    if dfhack.getHideArmokTools() and helpdb.has_tag(first_word, 'armok') then
+    if dfhack.getMortalMode() and helpdb.has_tag(first_word, 'armok') then
         return false
     end
     return data.help_command and
diff --git a/internal/control-panel/registry.lua b/internal/control-panel/registry.lua
index bf479ad444..c176d4245c 100644
--- a/internal/control-panel/registry.lua
+++ b/internal/control-panel/registry.lua
@@ -136,8 +136,8 @@ PREFERENCES_BY_IDX = {
         label='Mortal mode: hide "armok" tools',
         desc='Don\'t show tools that give you god-like powers wherever DFHack tools are listed.',
         default=false,
-        get_fn=function() return dfhack.HIDE_ARMOK_TOOLS end,
-        set_fn=function(val) dfhack.HIDE_ARMOK_TOOLS = val end,
+        get_fn=dfhack.getMortalMode,
+        set_fn=dfhack.setMortalMode,
     },
     {
         name='FILTER_FULL_TEXT',
@@ -152,8 +152,8 @@ PREFERENCES_BY_IDX = {
         label='Hide console on startup (MS Windows only)',
         desc='Hide the external DFHack terminal window on startup. Use the "show" command to unhide it.',
         default=true,
-        get_fn=function() return dfhack.HIDE_CONSOLE_ON_STARTUP end,
-        set_fn=function(val) dfhack.HIDE_CONSOLE_ON_STARTUP = val end,
+        get_fn=dfhack.getHideConsoleOnStartup,
+        set_fn=dfhack.setHideConsoleOnStartup,
     },
     {
         name='DEFAULT_INITIAL_PAUSE',