diff --git a/HormoneAssay/test/src/org/labkey/test/tests/external/labModules/HormoneAssayTest.java b/HormoneAssay/test/src/org/labkey/test/tests/external/labModules/HormoneAssayTest.java
index 6aadf5fdf..125389d9e 100644
--- a/HormoneAssay/test/src/org/labkey/test/tests/external/labModules/HormoneAssayTest.java
+++ b/HormoneAssay/test/src/org/labkey/test/tests/external/labModules/HormoneAssayTest.java
@@ -24,7 +24,7 @@
 import org.labkey.remoteapi.Connection;
 import org.labkey.remoteapi.query.Filter;
 import org.labkey.remoteapi.query.InsertRowsCommand;
-import org.labkey.remoteapi.query.SaveRowsResponse;
+import org.labkey.remoteapi.query.RowsResponse;
 import org.labkey.remoteapi.query.SelectRowsCommand;
 import org.labkey.remoteapi.query.SelectRowsResponse;
 import org.labkey.test.Locator;
@@ -631,7 +631,7 @@ private void ensureTestRecords() throws CommandException, IOException
                 row.put("code", tests.get(test)[0]);
                 row.put("units", tests.get(test)[1]);
                 insertCmd.addRow(row);
-                SaveRowsResponse saveResp = insertCmd.execute(cn, getProjectName());
+                RowsResponse saveResp = insertCmd.execute(cn, getProjectName());
                 assertEquals("Incorrect row count", 1, saveResp.getRowsAffected().intValue());
             }
         }
diff --git a/onprc_ehr/test/src/org/labkey/test/tests/onprc_ehr/AbstractGenericONPRC_EHRTest.java b/onprc_ehr/test/src/org/labkey/test/tests/onprc_ehr/AbstractGenericONPRC_EHRTest.java
index ad5fd9b60..9ec818d69 100644
--- a/onprc_ehr/test/src/org/labkey/test/tests/onprc_ehr/AbstractGenericONPRC_EHRTest.java
+++ b/onprc_ehr/test/src/org/labkey/test/tests/onprc_ehr/AbstractGenericONPRC_EHRTest.java
@@ -23,7 +23,7 @@
 import org.labkey.remoteapi.SimplePostCommand;
 import org.labkey.remoteapi.query.Filter;
 import org.labkey.remoteapi.query.InsertRowsCommand;
-import org.labkey.remoteapi.query.SaveRowsResponse;
+import org.labkey.remoteapi.query.RowsResponse;
 import org.labkey.remoteapi.query.SelectRowsCommand;
 import org.labkey.remoteapi.query.SelectRowsResponse;
 import org.labkey.test.Locator;
@@ -400,7 +400,7 @@ protected String ensureFlagExists(final String category, final String name, fina
                 }
             });
 
-            SaveRowsResponse saveRowsResponse = insertRowsCommand.execute(getApiHelper().getConnection(), getContainerPath());
+            RowsResponse saveRowsResponse = insertRowsCommand.execute(getApiHelper().getConnection(), getContainerPath());
             objectid = (String)saveRowsResponse.getRows().get(0).get("objectid");
         }
 
@@ -450,7 +450,7 @@ protected Integer getOrCreateGroup(final String name) throws Exception
                 }
             });
 
-            SaveRowsResponse saveRowsResponse = insertRowsCommand.execute(getApiHelper().getConnection(), getContainerPath());
+            RowsResponse saveRowsResponse = insertRowsCommand.execute(getApiHelper().getConnection(), getContainerPath());
             groupId = (Integer)saveRowsResponse.getRows().get(0).get("rowid");
         }
 
@@ -500,7 +500,7 @@ protected String getOrCreateSpfFlag(final String name) throws Exception
                 }
             });
 
-            SaveRowsResponse saveRowsResponse = insertRowsCommand.execute(getApiHelper().getConnection(), getContainerPath());
+            RowsResponse saveRowsResponse = insertRowsCommand.execute(getApiHelper().getConnection(), getContainerPath());
             objectid = (String)saveRowsResponse.getRows().get(0).get("objectid");
         }
 
diff --git a/onprc_ehr/test/src/org/labkey/test/tests/onprc_ehr/ONPRC_EHRTest2.java b/onprc_ehr/test/src/org/labkey/test/tests/onprc_ehr/ONPRC_EHRTest2.java
index a2c7847ae..334843e80 100644
--- a/onprc_ehr/test/src/org/labkey/test/tests/onprc_ehr/ONPRC_EHRTest2.java
+++ b/onprc_ehr/test/src/org/labkey/test/tests/onprc_ehr/ONPRC_EHRTest2.java
@@ -30,7 +30,7 @@
 import org.labkey.remoteapi.query.ExecuteSqlCommand;
 import org.labkey.remoteapi.query.Filter;
 import org.labkey.remoteapi.query.InsertRowsCommand;
-import org.labkey.remoteapi.query.SaveRowsResponse;
+import org.labkey.remoteapi.query.RowsResponse;
 import org.labkey.remoteapi.query.SelectRowsCommand;
 import org.labkey.remoteapi.query.SelectRowsResponse;
 import org.labkey.test.BaseWebDriverTest;
@@ -250,7 +250,7 @@ public void testBirthStatusApi() throws Exception
         insertRowsCommand1.addRow(getApiHelper().createHashMap(birthFields, new Object[]{offspringId7, birthDate, "Live Birth", null, null, "f", room1, cage1, damId1, null, weight, birthDate, "In Progress"}));
         insertRowsCommand1.addRow(getApiHelper().createHashMap(birthFields, new Object[]{offspringId8, birthDate, "Live Birth", null, null, "f", room1, cage1, damId1, null, weight, birthDate, "Completed"}));
         insertRowsCommand1.setTimeout(0);
-        SaveRowsResponse insertRowsResp = insertRowsCommand1.execute(getApiHelper().getConnection(), getContainerPath());
+        RowsResponse insertRowsResp = insertRowsCommand1.execute(getApiHelper().getConnection(), getContainerPath());
 
         final Map<String, String> lsidMap = new HashMap<>();
         for (Map<String, Object> row : insertRowsResp.getRows())
@@ -757,7 +757,7 @@ public void testBirthInheritFromDam() throws Exception
         String U24_PROJECT = "0492-03";
         InsertRowsCommand projectCommand = new InsertRowsCommand("ehr", "project");
         projectCommand.addRow(Maps.of("project", null, "name", U24_PROJECT, "protocol", DUMMY_PROTOCOL));
-        SaveRowsResponse saveRowsResponse = projectCommand.execute(getApiHelper().getConnection(), getContainerPath());
+        RowsResponse saveRowsResponse = projectCommand.execute(getApiHelper().getConnection(), getContainerPath());
         Integer projectId = (Integer)saveRowsResponse.getRows().get(0).get("project");
 
         // Insert dam project assignment into assignment via API