diff --git a/LDK/api-src/org/labkey/api/ldk/table/AbstractDataDefinedTable.java b/LDK/api-src/org/labkey/api/ldk/table/AbstractDataDefinedTable.java
index 7beee14b..28592534 100644
--- a/LDK/api-src/org/labkey/api/ldk/table/AbstractDataDefinedTable.java
+++ b/LDK/api-src/org/labkey/api/ldk/table/AbstractDataDefinedTable.java
@@ -15,7 +15,7 @@
  */
 package org.labkey.api.ldk.table;
 
-import org.apache.commons.lang3.StringUtils;
+import org.apache.commons.lang3.Strings;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 import org.labkey.api.data.AbstractTableInfo;
@@ -263,13 +263,13 @@ protected void configureTranslator(DataIterator input, final SimpleTranslator it
             for (int idx = 1; idx <= input.getColumnCount(); idx++)
             {
                 ColumnInfo col = input.getColumnInfo(idx);
-                if (StringUtils.equalsIgnoreCase(_filterColumn, col.getName()))
+                if (Strings.CI.equals(_filterColumn, col.getName()))
                 {
                     inputColMap.put(_filterColumn, idx);
                     continue;
                 }
 
-                if (StringUtils.equalsIgnoreCase(_valueColumn, col.getName()))
+                if (Strings.CI.equals(_valueColumn, col.getName()))
                 {
                     inputColMap.put(_valueColumn, idx);
                     continue;
diff --git a/LDK/api-src/org/labkey/api/ldk/table/ContainerScopedTable.java b/LDK/api-src/org/labkey/api/ldk/table/ContainerScopedTable.java
index 2dec8ec5..0e1df06d 100644
--- a/LDK/api-src/org/labkey/api/ldk/table/ContainerScopedTable.java
+++ b/LDK/api-src/org/labkey/api/ldk/table/ContainerScopedTable.java
@@ -16,7 +16,7 @@
 package org.labkey.api.ldk.table;
 
 import org.apache.commons.beanutils.ConversionException;
-import org.apache.commons.lang3.StringUtils;
+import org.apache.commons.lang3.Strings;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
 import org.jetbrains.annotations.NotNull;
@@ -246,13 +246,13 @@ public DataIterator getDataIterator(DataIteratorContext context)
             for (int idx = 1; idx <= input.getColumnCount(); idx++)
             {
                 ColumnInfo col = input.getColumnInfo(idx);
-                if (StringUtils.equalsIgnoreCase(_pseudoPk, col.getName()))
+                if (Strings.CI.equals(_pseudoPk, col.getName()))
                 {
                     inputColMap.put(_pseudoPk, idx);
                     continue;
                 }
 
-                if (StringUtils.equalsIgnoreCase(getContainerFilterColumn(), col.getName()))
+                if (Strings.CI.equals(getContainerFilterColumn(), col.getName()))
                 {
                     inputColMap.put(getContainerFilterColumn(), idx);
                 }
diff --git a/laboratory/api-src/org/labkey/api/laboratory/query/ContainerIncrementingTable.java b/laboratory/api-src/org/labkey/api/laboratory/query/ContainerIncrementingTable.java
index e1912f4a..845931af 100644
--- a/laboratory/api-src/org/labkey/api/laboratory/query/ContainerIncrementingTable.java
+++ b/laboratory/api-src/org/labkey/api/laboratory/query/ContainerIncrementingTable.java
@@ -15,7 +15,7 @@
  */
 package org.labkey.api.laboratory.query;
 
-import org.apache.commons.lang3.StringUtils;
+import org.apache.commons.lang3.Strings;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 import org.labkey.api.data.Aggregate;
@@ -297,13 +297,13 @@ public void close() throws IOException
             for (int idx = 1; idx <= input.getColumnCount(); idx++)
             {
                 ColumnInfo col = input.getColumnInfo(idx);
-                if (StringUtils.equalsIgnoreCase(_incrementingCol, col.getName()))
+                if (Strings.CI.equals(_incrementingCol, col.getName()))
                 {
                     inputColMap.put(_incrementingCol, idx);
                     continue;
                 }
 
-                if (StringUtils.equalsIgnoreCase(getContainerFilterColumn(), col.getName()))
+                if (Strings.CI.equals(getContainerFilterColumn(), col.getName()))
                 {
                     inputColMap.put(getContainerFilterColumn(), idx);
                 }
diff --git a/laboratory/src/org/labkey/laboratory/query/LaboratoryWorkbooksTable.java b/laboratory/src/org/labkey/laboratory/query/LaboratoryWorkbooksTable.java
index 9b1d9a7b..b71d7f0c 100644
--- a/laboratory/src/org/labkey/laboratory/query/LaboratoryWorkbooksTable.java
+++ b/laboratory/src/org/labkey/laboratory/query/LaboratoryWorkbooksTable.java
@@ -15,7 +15,7 @@
  */
 package org.labkey.laboratory.query;
 
-import org.apache.commons.lang3.StringUtils;
+import org.apache.commons.lang3.Strings;
 import org.apache.logging.log4j.Logger;
 import org.apache.logging.log4j.LogManager;
 import org.jetbrains.annotations.NotNull;
@@ -216,25 +216,25 @@ public DataIterator getDataIterator(DataIteratorContext context)
             for (int idx = 1; idx <= input.getColumnCount(); idx++)
             {
                 ColumnInfo col = input.getColumnInfo(idx);
-                if (StringUtils.equalsIgnoreCase(WORKBOOK_ID_COl, col.getName()))
+                if (Strings.CI.equals(WORKBOOK_ID_COl, col.getName()))
                 {
                     inputColMap.put(WORKBOOK_ID_COl, idx);
                     continue;
                 }
 
-                if (StringUtils.equalsIgnoreCase(LaboratoryWorkbooksTable.PARENT_COL, col.getName()))
+                if (Strings.CI.equals(LaboratoryWorkbooksTable.PARENT_COL, col.getName()))
                 {
                     inputColMap.put(PARENT_COL, idx);
                     continue;
                 }
 
-                if (StringUtils.equalsIgnoreCase(LaboratoryWorkbooksTable.CONTAINER_ROWID_COL, col.getName()))
+                if (Strings.CI.equals(LaboratoryWorkbooksTable.CONTAINER_ROWID_COL, col.getName()))
                 {
                     inputColMap.put(CONTAINER_ROWID_COL, idx);
                     continue;
                 }
 
-                if (StringUtils.equalsIgnoreCase(LaboratoryWorkbooksTable.WORKBOOK_COL, col.getName()))
+                if (Strings.CI.equals(LaboratoryWorkbooksTable.WORKBOOK_COL, col.getName()))
                 {
                     outputColMap.put(WORKBOOK_COL, inputColMap.put(WORKBOOK_COL, idx));
                 }