diff --git a/Core/src/org/sleuthkit/autopsy/datamodel/hosts/ManageHostsDialog.java b/Core/src/org/sleuthkit/autopsy/datamodel/hosts/ManageHostsDialog.java
index 7d4d521b51..5573cac9a5 100644
--- a/Core/src/org/sleuthkit/autopsy/datamodel/hosts/ManageHostsDialog.java
+++ b/Core/src/org/sleuthkit/autopsy/datamodel/hosts/ManageHostsDialog.java
@@ -234,9 +234,8 @@ public class ManageHostsDialog extends javax.swing.JDialog {
         if (selectedHost != null) {
             String newHostName = getAddEditDialogName(selectedHost);
             if (newHostName != null) {
-                selectedHost.setName(newHostName);
                 try {
-                    Case.getCurrentCaseThrows().getSleuthkitCase().getHostManager().updateHost(selectedHost);
+                    Case.getCurrentCaseThrows().getSleuthkitCase().getHostManager().updateHostName(selectedHost, newHostName);
                 } catch (NoCurrentCaseException | TskCoreException e) {
                     logger.log(Level.WARNING, String.format("Unable to update host '%s' with id: %d at this time.", selectedHost.getName(), selectedHost.getHostId()), e);
                 }