diff --git a/api/src/org/labkey/api/settings/LookAndFeelProperties.java b/api/src/org/labkey/api/settings/LookAndFeelProperties.java
index 5326a064b06..131e55f87ed 100644
--- a/api/src/org/labkey/api/settings/LookAndFeelProperties.java
+++ b/api/src/org/labkey/api/settings/LookAndFeelProperties.java
@@ -39,7 +39,6 @@
 import static org.labkey.api.settings.LookAndFeelProperties.Properties.helpMenuEnabled;
 import static org.labkey.api.settings.LookAndFeelProperties.Properties.logoHref;
 import static org.labkey.api.settings.LookAndFeelProperties.Properties.reportAProblemPath;
-import static org.labkey.api.settings.LookAndFeelProperties.Properties.restrictedColumnsEnabled;
 import static org.labkey.api.settings.LookAndFeelProperties.Properties.supportEmail;
 import static org.labkey.api.settings.LookAndFeelProperties.Properties.systemDescription;
 import static org.labkey.api.settings.LookAndFeelProperties.Properties.systemEmailAddress;
@@ -68,7 +67,7 @@ public enum Properties implements StartupProperty, SafeToRenderEnum
         themeName("Server color scheme. Valid values: " + Arrays.toString(Theme.values())),
         folderDisplayMode("Show project and folder navigation. Valid values: " + Arrays.toString(FolderDisplayMode.values())),
         applicationMenuDisplayMode("Show application selection menu. Valid values: " + Arrays.toString(FolderDisplayMode.values())),
-        helpMenuEnabled("Show LabKey Help menu item"),
+        helpMenuEnabled("Show LabKey Documentation menu item"),
         logoHref("Logo link (specifies page to which header logo links)"),
         reportAProblemPath("Support link (specifies page where users can request support)"),
         supportEmail("Support email (shown to users if they don't have permission to see a page, or are having trouble logging in)"),
@@ -246,14 +245,14 @@ public FolderDisplayMode getApplicationMenuDisplayModeStored()
         return displayMode != null ? FolderDisplayMode.fromString(lookupStringValue(applicationMenuDisplayMode, null)) : null;
     }
 
-    public boolean isHelpMenuEnabled()
+    public boolean isDocumentationMenuEnabled()
     {
         return lookupBooleanValue(helpMenuEnabled, true);
     }
 
-    public Boolean isHelpMenuEnabledStored()
+    public Boolean isDocumentationMenuEnabledStored()
     {
-        String stored = getStoredValue(restrictedColumnsEnabled);
+        String stored = getStoredValue(helpMenuEnabled);
         return null == stored ? null : "TRUE".equals(stored);
     }
 
diff --git a/api/src/org/labkey/api/settings/WriteableLookAndFeelProperties.java b/api/src/org/labkey/api/settings/WriteableLookAndFeelProperties.java
index 58bee3989ce..a951bd5e5b2 100644
--- a/api/src/org/labkey/api/settings/WriteableLookAndFeelProperties.java
+++ b/api/src/org/labkey/api/settings/WriteableLookAndFeelProperties.java
@@ -139,12 +139,12 @@ public void clearApplicationMenuDisplayMode()
         remove(applicationMenuDisplayMode);
     }
 
-    public void setHelpMenuEnabled(boolean enabled)
+    public void setDocumentationMenuEnabled(boolean enabled)
     {
         storeBooleanValue(helpMenuEnabled, enabled);
     }
 
-    public void clearHelpMenuEnabled()
+    public void clearDocumentationMenuEnabled()
     {
         remove(helpMenuEnabled);
     }
diff --git a/api/src/org/labkey/api/view/PopupHelpView.java b/api/src/org/labkey/api/view/PopupHelpView.java
index 373cafe632f..1d870910603 100644
--- a/api/src/org/labkey/api/view/PopupHelpView.java
+++ b/api/src/org/labkey/api/view/PopupHelpView.java
@@ -51,7 +51,7 @@ public static NavTree createNavTree(ViewContext context, HelpTopic topic)
                 menu.addChild("Support", reportAProblemPath);
         }
 
-        if (laf.isHelpMenuEnabled())
+        if (laf.isDocumentationMenuEnabled())
             menu.addChild(topic.getNavTree("LabKey Documentation"));
 
         return menu;
diff --git a/core/src/org/labkey/core/admin/AdminController.java b/core/src/org/labkey/core/admin/AdminController.java
index b4da6864ac2..9c0e6bc69c4 100644
--- a/core/src/org/labkey/core/admin/AdminController.java
+++ b/core/src/org/labkey/core/admin/AdminController.java
@@ -11722,7 +11722,7 @@ private static boolean saveProjectSettings(Container c, User user, ProjectSettin
         setProperty(form.isThemeNameInherited(), props::clearThemeName, () -> props.setThemeName(form.getThemeName()));
         setProperty(form.isFolderDisplayModeInherited(), props::clearFolderDisplayMode, () -> props.setFolderDisplayMode(FolderDisplayMode.fromString(form.getFolderDisplayMode())));
         setProperty(form.isApplicationMenuDisplayModeInherited(), props::clearApplicationMenuDisplayMode, () -> props.setApplicationMenuDisplayMode(FolderDisplayMode.fromString(form.getApplicationMenuDisplayMode())));
-        setProperty(form.isHelpMenuEnabledInherited(), props::clearHelpMenuEnabled, () -> props.setHelpMenuEnabled(form.isHelpMenuEnabled()));
+        setProperty(form.isHelpMenuEnabledInherited(), props::clearDocumentationMenuEnabled, () -> props.setDocumentationMenuEnabled(form.isHelpMenuEnabled()));
 
         // a few properties on this page should be restricted to operational permissions (i.e. site admin)
         if (hasAdminOpsPerm)
diff --git a/core/src/org/labkey/core/admin/lookAndFeelProperties.jsp b/core/src/org/labkey/core/admin/lookAndFeelProperties.jsp
index edb039f3ed2..aa6e4da63ed 100644
--- a/core/src/org/labkey/core/admin/lookAndFeelProperties.jsp
+++ b/core/src/org/labkey/core/admin/lookAndFeelProperties.jsp
@@ -198,10 +198,10 @@
     }
 %>
 <tr>
-    <td class="labkey-form-label"><label for="<%=helpMenuEnabled%>">Show LabKey Help menu item</label></td>
-    <% inherited = isInherited(laf.isHelpMenuEnabledStored()); %>
+    <td class="labkey-form-label"><label for="<%=helpMenuEnabled%>">Show LabKey Documentation menu item</label></td>
+    <% inherited = isInherited(laf.isDocumentationMenuEnabledStored()); %>
     <%=inheritCheckbox(inherited, helpMenuEnabled)%>
-    <td><input type="checkbox" id="<%=helpMenuEnabled%>" name="<%=helpMenuEnabled%>" size="<%=standardInputWidth%>"<%=checked(laf.isHelpMenuEnabled())%><%=disabled(inherited)%>></td>
+    <td><input type="checkbox" id="<%=helpMenuEnabled%>" name="<%=helpMenuEnabled%>" size="<%=standardInputWidth%>"<%=checked(laf.isDocumentationMenuEnabled())%><%=disabled(inherited)%>></td>
 </tr>
 <tr>
     <td class="labkey-form-label"><label for="<%=logoHref%>">Logo link (specifies page that header logo links to)</label></td>