diff --git a/Core/src/org/sleuthkit/autopsy/actions/ReplaceBlackboardArtifactTagAction.java b/Core/src/org/sleuthkit/autopsy/actions/ReplaceBlackboardArtifactTagAction.java
index 17fbb40e1b..a2895b4d55 100644
--- a/Core/src/org/sleuthkit/autopsy/actions/ReplaceBlackboardArtifactTagAction.java
+++ b/Core/src/org/sleuthkit/autopsy/actions/ReplaceBlackboardArtifactTagAction.java
@@ -64,14 +64,14 @@ public final class ReplaceBlackboardArtifactTagAction extends ReplaceTagAction<B
      * 
      * @param oldArtifactTag tag to be replaced
      * @param newTagName name of the tag to replace with
-     * @param comment the comment for the tag use an empty string for no comment
+     * @param newComment the newComment for the tag use an empty string for no newComment
      */
     @NbBundle.Messages({
         "# {0} - old tag name",
         "# {1} - artifactID",
         "ReplaceBlackboardArtifactTagAction.replaceTag.alert=Unable to replace tag {0} for artifact {1}."})
     @Override
-    protected void replaceTag( BlackboardArtifactTag oldArtifactTag, TagName newTagName, String comment) {
+    protected void replaceTag( BlackboardArtifactTag oldArtifactTag, TagName newTagName, String newComment) {
         new SwingWorker<Void, Void>() {
             
             @Override
@@ -91,7 +91,7 @@ public final class ReplaceBlackboardArtifactTagAction extends ReplaceTagAction<B
                     logger.log(Level.INFO, "Replacing tag {0}  with tag {1} for artifact {2}", new Object[]{oldArtifactTag.getName().getDisplayName(), newTagName.getDisplayName(), oldArtifactTag.getContent().getName()}); //NON-NLS
 
                     tagsManager.deleteBlackboardArtifactTag(oldArtifactTag);
-                    tagsManager.addBlackboardArtifactTag(oldArtifactTag.getArtifact(), newTagName, comment);
+                    tagsManager.addBlackboardArtifactTag(oldArtifactTag.getArtifact(), newTagName, newComment);
 
                 } catch (TskCoreException tskCoreException) {
                     logger.log(Level.SEVERE, "Error replacing artifact tag", tskCoreException); //NON-NLS
diff --git a/Core/src/org/sleuthkit/autopsy/actions/ReplaceContentTagAction.java b/Core/src/org/sleuthkit/autopsy/actions/ReplaceContentTagAction.java
index ba483ad3c9..51b898eb84 100644
--- a/Core/src/org/sleuthkit/autopsy/actions/ReplaceContentTagAction.java
+++ b/Core/src/org/sleuthkit/autopsy/actions/ReplaceContentTagAction.java
@@ -64,7 +64,7 @@ public final class ReplaceContentTagAction extends ReplaceTagAction<ContentTag>
         "# {1} - content obj id",
         "ReplaceContentTagAction.replaceTag.alert=Unable to replace tag {0} for {1}."})
     @Override
-    protected void replaceTag(ContentTag oldTag, TagName newTagName, String comment) {
+    protected void replaceTag(ContentTag oldTag, TagName newTagName, String newComment) {
         new SwingWorker<Void, Void>() {
 
             @Override
@@ -84,7 +84,7 @@ public final class ReplaceContentTagAction extends ReplaceTagAction<ContentTag>
                     logger.log(Level.INFO, "Replacing tag {0}  with tag {1} for artifact {2}", new Object[]{oldTag.getName().getDisplayName(), newTagName.getDisplayName(), oldTag.getContent().getName()}); //NON-NLS
 
                     tagsManager.deleteContentTag(oldTag);
-                    tagsManager.addContentTag(oldTag.getContent(), newTagName, comment);
+                    tagsManager.addContentTag(oldTag.getContent(), newTagName, newComment);
 
                 } catch (TskCoreException tskCoreException) {
                     logger.log(Level.SEVERE, "Error replacing artifact tag", tskCoreException); //NON-NLS
diff --git a/Core/src/org/sleuthkit/autopsy/actions/ReplaceTagAction.java b/Core/src/org/sleuthkit/autopsy/actions/ReplaceTagAction.java
index 03d48f4012..79ca4f4739 100644
--- a/Core/src/org/sleuthkit/autopsy/actions/ReplaceTagAction.java
+++ b/Core/src/org/sleuthkit/autopsy/actions/ReplaceTagAction.java
@@ -141,7 +141,7 @@ abstract class ReplaceTagAction<T extends Tag> extends AbstractAction implements
                     // Add action to replace the tag
                     tagNameItem.addActionListener((ActionEvent event) -> {
                         selectedTags.forEach((oldtag) -> {
-                            replaceTag(oldtag, entry.getValue(), "");
+                            replaceTag(oldtag, entry.getValue(), oldtag.getComment());
                         });
                     });
 
@@ -178,7 +178,7 @@ abstract class ReplaceTagAction<T extends Tag> extends AbstractAction implements
                 TagName newTagName = GetTagNameDialog.doDialog();
                 if (null != newTagName) {
                     selectedTags.forEach((oldtag) -> {
-                        replaceTag(oldtag, newTagName, "");
+                        replaceTag(oldtag, newTagName, oldtag.getComment());
                     });
                 }
             });