diff --git a/src/org/labkey/test/AppLocators.java b/src/org/labkey/test/AppLocators.java
index d61f6980e5..e9e2098954 100644
--- a/src/org/labkey/test/AppLocators.java
+++ b/src/org/labkey/test/AppLocators.java
@@ -4,5 +4,5 @@ public abstract class AppLocators
 {
     private AppLocators() {}
 
-    public static final Locator.XPathLocator detailHeaderName = Locator.tagWithClass("h2", "detail__header--name");
+    public static final Locator.XPathLocator detailHeaderName = Locator.tagWithClass("h1", "detail__header--name");
 }
diff --git a/src/org/labkey/test/components/bootstrap/Panel.java b/src/org/labkey/test/components/bootstrap/Panel.java
index 2b8a74edff..da0ce2e155 100644
--- a/src/org/labkey/test/components/bootstrap/Panel.java
+++ b/src/org/labkey/test/components/bootstrap/Panel.java
@@ -13,7 +13,7 @@
  * <pre>{@code
  *
  * <div class="panel panel-default">
- *   <div class="panel-heading">Panel Title</div>
+ *   <h2 class="panel-heading">Panel Title</h2>
  *   <div class="panel-body">
  *       <SomeComponent>
  *   </div>
diff --git a/src/org/labkey/test/components/html/DetailContainer.java b/src/org/labkey/test/components/html/DetailContainer.java
index d9029841f7..f8d9dd5fc7 100644
--- a/src/org/labkey/test/components/html/DetailContainer.java
+++ b/src/org/labkey/test/components/html/DetailContainer.java
@@ -53,7 +53,7 @@ protected class ElementCache extends Component<?>.ElementCache
     static public class Locators
     {
         static public Locator.XPathLocator panelLoc = Locator.tagWithClass("div", "panel-default");
-        static public Locator.XPathLocator headerLoc = Locator.tagWithClass("div", "panel-heading");
+        static public Locator.XPathLocator headerLoc = Locator.byClass("panel-heading");
         static public Locator.XPathLocator bodyLoc = Locator.tagWithClass("div", "panel-body");
         static public Locator panelWithTitle(String title)
         {
diff --git a/src/org/labkey/test/components/ui/assay/RunDataPanel.java b/src/org/labkey/test/components/ui/assay/RunDataPanel.java
index c4b1c4614b..7021dc517c 100644
--- a/src/org/labkey/test/components/ui/assay/RunDataPanel.java
+++ b/src/org/labkey/test/components/ui/assay/RunDataPanel.java
@@ -243,7 +243,7 @@ protected Locator locator()
         {
             if (_title != null)
                 return Locator.tagWithClass("div", "panel")
-                        .withChild(Locator.tagWithClass("div", "panel-heading").withText(_title))
+                        .withChild(Locator.byClass( "panel-heading").withText(_title))
                         .child(Locator.tagWithClass("div", "panel-body"));
             else
                 return _baseLocator;
diff --git a/src/org/labkey/test/components/ui/entities/ParentEntityEditPanel.java b/src/org/labkey/test/components/ui/entities/ParentEntityEditPanel.java
index 9c8e1b0611..99de35da03 100644
--- a/src/org/labkey/test/components/ui/entities/ParentEntityEditPanel.java
+++ b/src/org/labkey/test/components/ui/entities/ParentEntityEditPanel.java
@@ -127,7 +127,7 @@ private void clickButtonWaitForPanel(WebElement button, int wait)
                 infoCount <= 1);
 
         // A reference to the editing header title
-        Locator editingLocator = Locator.tagWithClass("div", "panel-heading").startsWith("Editing");
+        Locator editingLocator = Locator.byClass("panel-heading").startsWith("Editing");
 
         Assert.assertEquals("Cannot find a panel with 'Editing' in the header. There isn't a panel in edit mode.",
                 1, editingLocator.findElements(getDriver()).size());
diff --git a/src/org/labkey/test/components/ui/grids/DetailDataPanel.java b/src/org/labkey/test/components/ui/grids/DetailDataPanel.java
index 06c655bf8b..2e8516c2a0 100644
--- a/src/org/labkey/test/components/ui/grids/DetailDataPanel.java
+++ b/src/org/labkey/test/components/ui/grids/DetailDataPanel.java
@@ -222,7 +222,7 @@ protected Locator locator()
             if (_asTooltip)
                 return _baseLocatorAsTooltip;
             else if (_title != null)
-                return _baseLocator.withChild(Locator.tagWithClass("div", "panel-heading")
+                return _baseLocator.withChild(Locator.byClass("panel-heading")
                         .withText(_title));
             else
                 return _baseLocator;
diff --git a/src/org/labkey/test/components/ui/grids/DetailTable.java b/src/org/labkey/test/components/ui/grids/DetailTable.java
index 9a4d964ca6..4e694aaf64 100644
--- a/src/org/labkey/test/components/ui/grids/DetailTable.java
+++ b/src/org/labkey/test/components/ui/grids/DetailTable.java
@@ -281,7 +281,7 @@ public DetailTableFinder(WebDriver driver)
         public DetailTableFinder withTitle(String title)
         {
             _locator = Locator.tagWithClass("div", "panel")
-                    .withChild(Locator.tagWithClass("div", "panel-heading").startsWith(title))
+                    .withChild(Locator.byClass("panel-heading").startsWith(title))
                     .descendant(_baseLocator);
             return this;
         }
diff --git a/src/org/labkey/test/components/ui/grids/DetailTableEdit.java b/src/org/labkey/test/components/ui/grids/DetailTableEdit.java
index ef867cf779..9992ac4656 100644
--- a/src/org/labkey/test/components/ui/grids/DetailTableEdit.java
+++ b/src/org/labkey/test/components/ui/grids/DetailTableEdit.java
@@ -580,7 +580,7 @@ public ElementCache()
                     .invisibilityOfAllElements(Locator.byClass("select-input__loading-indicator").findElements(this)));
         }
 
-        public final WebElement header = Locator.tagWithClass("div", "panel-heading")
+        public final WebElement header = Locator.byClass("panel-heading")
                 .findWhenNeeded(this);
         public final WebElement editPanel = Locator.tagWithClass("div", "detail__editing")
                 .findWhenNeeded(this);
diff --git a/src/org/labkey/test/components/ui/grids/ParentDetailPanel.java b/src/org/labkey/test/components/ui/grids/ParentDetailPanel.java
index 1a119bb1a7..52c26ca707 100644
--- a/src/org/labkey/test/components/ui/grids/ParentDetailPanel.java
+++ b/src/org/labkey/test/components/ui/grids/ParentDetailPanel.java
@@ -154,7 +154,7 @@ protected ElementCache newElementCache()
 
     protected class ElementCache extends Component<?>.ElementCache
     {
-        public WebElement panelHeading = Locator.tagWithClass("div", "panel-heading")
+        public WebElement panelHeading = Locator.byClass( "panel-heading")
                 .findWhenNeeded(this).withTimeout(2000);
 
         public Locator editBtnLoc = Locator.tagWithClass("div", "detail__edit-button");
@@ -200,7 +200,7 @@ public ResponsiveGrid<?> responsiveGridFor(String type)
     public static class ParentDetailPanelFinder extends WebDriverComponentFinder<ParentDetailPanel, ParentDetailPanelFinder>
     {
         private final Locator.XPathLocator _baseLocator = Locator.tagWithClass("div", "panel-default")
-                .withChild(Locator.tagWithClass("div", "panel-heading")
+                .withChild(Locator.byClass("panel-heading")
                 .withChild(Locator.tagWithClass("span", "detail__edit--heading")));
         private String _title = null;
 
@@ -225,7 +225,7 @@ protected ParentDetailPanel construct(WebElement el, WebDriver driver)
         protected Locator locator()
         {
             if (_title != null)
-                return  _baseLocator.withDescendant(Locator.tagWithClass("div", "panel-heading")
+                return  _baseLocator.withDescendant(Locator.byClass("panel-heading")
                         .startsWith(_title));
             else
                 return _baseLocator;
diff --git a/src/org/labkey/test/components/ui/grids/QueryGrid.java b/src/org/labkey/test/components/ui/grids/QueryGrid.java
index b1ad592b0e..8f70afe8ba 100644
--- a/src/org/labkey/test/components/ui/grids/QueryGrid.java
+++ b/src/org/labkey/test/components/ui/grids/QueryGrid.java
@@ -821,7 +821,7 @@ public List<FilterStatusValue> getFilterStatusFilterValues()
         // If this is the default view this will not be present.
         public WebElement panelHeader()
         {
-            return Locator.xpath("preceding-sibling::div[contains(@class,'panel-heading')]").findWhenNeeded(this);
+            return Locator.xpath("preceding-sibling::*[contains(@class,'panel-heading')]").findWhenNeeded(this);
         }
 
         final BootstrapMenu chartsMenu = new MultiMenu.MultiMenuFinder(getDriver()).withText("Charts").findWhenNeeded(this);
diff --git a/src/org/labkey/test/components/ui/lineage/LineageGraph.java b/src/org/labkey/test/components/ui/lineage/LineageGraph.java
index 576db342a4..2bff417f91 100644
--- a/src/org/labkey/test/components/ui/lineage/LineageGraph.java
+++ b/src/org/labkey/test/components/ui/lineage/LineageGraph.java
@@ -196,7 +196,7 @@ final WebElement lineageItem(String name, WebElement tabPanel)
                 .findWhenNeeded(this).withTimeout(4000);
         final WebElement componentDetailImage = Locator.tagWithClass("i", "component-detail--child--img")
                 .child(Locator.tag("img")).findWhenNeeded(nodeDetailContainer);
-        final WebElement nodeDetailName = Locator.tagWithClass("h4", "lineage-name-data")
+        final WebElement nodeDetailName = Locator.tagWithClass("div", "lineage-name-data")
                 .findWhenNeeded(nodeDetailContainer);
         final WebElement nodeDetailLinksContainer = Locator.tagWithClass("div", "lineage-node-detail")
                 .findWhenNeeded(nodeDetailContainer);
diff --git a/src/org/labkey/test/components/ui/lineage/NodeDetailGroup.java b/src/org/labkey/test/components/ui/lineage/NodeDetailGroup.java
index abe84e8438..02cd7fe338 100644
--- a/src/org/labkey/test/components/ui/lineage/NodeDetailGroup.java
+++ b/src/org/labkey/test/components/ui/lineage/NodeDetailGroup.java
@@ -135,7 +135,7 @@ protected NodeDetailGroup construct(WebElement el, WebDriver driver)
         protected Locator locator()
         {
             if (_title != null)
-                return _baseLocator.withChild(Locator.tag("summary").withChild(Locator.tagContainingText("h6", _title)));
+                return _baseLocator.withChild(Locator.tag("summary").withChild(Locator.tagContainingText("div", _title)));
             else
                 return _baseLocator;
         }
diff --git a/src/org/labkey/test/components/ui/permissions/GroupDetailsPanel.java b/src/org/labkey/test/components/ui/permissions/GroupDetailsPanel.java
index ecab6e3030..50daf2a9f4 100644
--- a/src/org/labkey/test/components/ui/permissions/GroupDetailsPanel.java
+++ b/src/org/labkey/test/components/ui/permissions/GroupDetailsPanel.java
@@ -55,7 +55,7 @@ protected ElementCache newElementCache()
 
     protected class ElementCache extends Component<?>.ElementCache
     {
-        final WebElement title = Locator.tagWithClass("p", "panel-heading").findWhenNeeded(this);
+        final WebElement title = Locator.byClass("panel-heading").findWhenNeeded(this);
 
         WebElement detailValueEl(String label)
         {
diff --git a/src/org/labkey/test/pages/assay/elisa/ElisaRunDetailsPage.java b/src/org/labkey/test/pages/assay/elisa/ElisaRunDetailsPage.java
index 299ccf67d6..0d8f123761 100644
--- a/src/org/labkey/test/pages/assay/elisa/ElisaRunDetailsPage.java
+++ b/src/org/labkey/test/pages/assay/elisa/ElisaRunDetailsPage.java
@@ -200,7 +200,7 @@ protected class ElementCache extends LabKeyPage<?>.ElementCache
         Locator dataPanelWithTitle(String title)
         {
             return Locator.tagWithClass("div", "panel-default")
-                    .withChild(Locator.tagWithClass("div", "panel-heading").withText(title));
+                    .withChild(Locator.byClass("panel-heading").withText(title));
         }
 
         // data selections
@@ -233,7 +233,7 @@ Optional<ReactSelect> spotSelect()
 
         // curve fit
         WebElement curveFitPanel = Locator.tagWithClass("div", "panel-default")
-                .withChild(Locator.tagWithClass("div", "panel-heading").startsWith("Curve Fit:"))
+                .withChild(Locator.byClass( "panel-heading").startsWith("Curve Fit:"))
                 .findWhenNeeded(this);
         Checkbox showCurveFitLineBox = new Checkbox(Locator.checkbox().findWhenNeeded(curveFitPanel));
         Optional<WebElement> fitParameters()
diff --git a/src/org/labkey/test/pages/core/login/LoginConfigurePage.java b/src/org/labkey/test/pages/core/login/LoginConfigurePage.java
index 72cd4ec2d3..7f17e07219 100644
--- a/src/org/labkey/test/pages/core/login/LoginConfigurePage.java
+++ b/src/org/labkey/test/pages/core/login/LoginConfigurePage.java
@@ -169,7 +169,7 @@ protected class ElementCache extends LabKeyPage<?>.ElementCache
         WebElement globalSettingsPanel()
         {
             return Locator.tagWithClass("div", "panel-default")
-                    .withChild(Locator.tagWithClass("div", "panel-heading")
+                    .withChild(Locator.byClass("panel-heading")
                             .withChild(Locator.tag("span").withText("Global Settings")))
                     .waitForElement(this, WAIT_FOR_JAVASCRIPT);
         }
@@ -177,7 +177,7 @@ WebElement globalSettingsPanel()
         WebElement configurationsPanel()
         {
             return Locator.tagWithClass("div", "panel-default")
-                    .withDescendant(Locator.tagWithClass("div", "panel-heading").withChild(Locator.tag("span").withText("Configurations")))
+                    .withDescendant(Locator.byClass("panel-heading").withChild(Locator.tag("span").withText("Configurations")))
                     .waitForElement(this, WAIT_FOR_JAVASCRIPT);
         }