diff --git a/Core/src/org/sleuthkit/autopsy/corecomponents/DataResultViewerTable.java b/Core/src/org/sleuthkit/autopsy/corecomponents/DataResultViewerTable.java
index 3be8d2a615..e9fab8ed6f 100644
--- a/Core/src/org/sleuthkit/autopsy/corecomponents/DataResultViewerTable.java
+++ b/Core/src/org/sleuthkit/autopsy/corecomponents/DataResultViewerTable.java
@@ -57,7 +57,6 @@ import org.openide.util.NbPreferences;
 import org.sleuthkit.autopsy.casemodule.Case;
 import org.sleuthkit.autopsy.corecomponentinterfaces.DataResultViewer;
 import org.sleuthkit.autopsy.coreutils.Logger;
-import org.sleuthkit.autopsy.datamodel.DisplayableItemNode.ItemType;
 
 /**
  * DataResult sortable table viewer
@@ -467,7 +466,7 @@ public class DataResultViewerTable extends AbstractDataResultViewer {
     
     // Get unique name for node and it's property.
     private String getUniqueName(Node root, Property<?> prop) {
-        ItemType type = ItemType.GENERIC;
+        String type = "Generic";
         if(root instanceof TableFilterNode) {
             TableFilterNode filterNode = (TableFilterNode) root;
             type =  filterNode.getItemType();
diff --git a/Core/src/org/sleuthkit/autopsy/corecomponents/TableFilterNode.java b/Core/src/org/sleuthkit/autopsy/corecomponents/TableFilterNode.java
index fc58d2732f..e622ee09b6 100644
--- a/Core/src/org/sleuthkit/autopsy/corecomponents/TableFilterNode.java
+++ b/Core/src/org/sleuthkit/autopsy/corecomponents/TableFilterNode.java
@@ -18,13 +18,9 @@
  */
 package org.sleuthkit.autopsy.corecomponents;
 
-import java.util.logging.Level;
 import org.openide.nodes.FilterNode;
 import org.openide.nodes.Node;
 import org.openide.util.NbBundle;
-import org.sleuthkit.autopsy.coreutils.Logger;
-import org.sleuthkit.autopsy.datamodel.KnownFileFilterNode;
-import org.sleuthkit.autopsy.datamodel.DisplayableItemNode.ItemType;
 
 /**
  * This class is used to filter the nodes that we want to show on the
@@ -36,7 +32,7 @@ import org.sleuthkit.autopsy.datamodel.DisplayableItemNode.ItemType;
 public class TableFilterNode extends FilterNode {
 
     private boolean createChild;
-    private ItemType itemType;
+    private String itemType;
 
     /**
      * the constructor
@@ -44,10 +40,10 @@ public class TableFilterNode extends FilterNode {
     public TableFilterNode(Node arg, boolean crChild) {
         super(arg, TableFilterChildren.createInstance(arg, crChild));
         this.createChild = crChild;
-        this.itemType = ItemType.GENERIC;
+        this.itemType = "Generic";
     }
     
-    public TableFilterNode(Node arg, boolean crChild, ItemType itemType) {
+    public TableFilterNode(Node arg, boolean crChild, String itemType) {
         super(arg, TableFilterChildren.createInstance(arg, crChild));
         this.createChild = crChild;
         this.itemType = itemType;
@@ -68,7 +64,7 @@ public class TableFilterNode extends FilterNode {
         }
     }
     
-    public ItemType getItemType() {
+    public String getItemType() {
         return itemType;
     }
 }
diff --git a/Core/src/org/sleuthkit/autopsy/datamodel/BlackboardArtifactNode.java b/Core/src/org/sleuthkit/autopsy/datamodel/BlackboardArtifactNode.java
index 28c10584b3..96b3a85c50 100644
--- a/Core/src/org/sleuthkit/autopsy/datamodel/BlackboardArtifactNode.java
+++ b/Core/src/org/sleuthkit/autopsy/datamodel/BlackboardArtifactNode.java
@@ -488,7 +488,7 @@ public class BlackboardArtifactNode extends DisplayableItemNode {
     }
 
     @Override
-    public ItemType getItemType() {
-        return ItemType.BLACKBOARD_ARTIFACT;
+    public String getItemType() {
+        return "BlackboardArtifact";
     }
 }
diff --git a/Core/src/org/sleuthkit/autopsy/datamodel/BlackboardArtifactTagNode.java b/Core/src/org/sleuthkit/autopsy/datamodel/BlackboardArtifactTagNode.java
index 12689c57ac..64868e4dd1 100755
--- a/Core/src/org/sleuthkit/autopsy/datamodel/BlackboardArtifactTagNode.java
+++ b/Core/src/org/sleuthkit/autopsy/datamodel/BlackboardArtifactTagNode.java
@@ -109,7 +109,7 @@ public class BlackboardArtifactTagNode extends DisplayableItemNode {
     }
 
     @Override
-    public ItemType getItemType() {
-        return ItemType.BLACKBOARD_ARTIFACT_TAG;
+    public String getItemType() {
+        return "BlackboardArtifactTag";
     }
 }
diff --git a/Core/src/org/sleuthkit/autopsy/datamodel/ContentTagNode.java b/Core/src/org/sleuthkit/autopsy/datamodel/ContentTagNode.java
index 779c2e2d05..669214eb8c 100755
--- a/Core/src/org/sleuthkit/autopsy/datamodel/ContentTagNode.java
+++ b/Core/src/org/sleuthkit/autopsy/datamodel/ContentTagNode.java
@@ -123,7 +123,7 @@ class ContentTagNode extends DisplayableItemNode {
     }
 
     @Override
-    public ItemType getItemType() {
-        return ItemType.CONTENT_TAG;
+    public String getItemType() {
+        return "ContentTag";
     }
 }
diff --git a/Core/src/org/sleuthkit/autopsy/datamodel/DataSourcesNode.java b/Core/src/org/sleuthkit/autopsy/datamodel/DataSourcesNode.java
index 86fe799c00..6669afbfc7 100644
--- a/Core/src/org/sleuthkit/autopsy/datamodel/DataSourcesNode.java
+++ b/Core/src/org/sleuthkit/autopsy/datamodel/DataSourcesNode.java
@@ -57,8 +57,8 @@ public class DataSourcesNode extends DisplayableItemNode {
     }
 
     @Override
-    public ItemType getItemType() {
-        return ItemType.DATA_SOURCES;
+    public String getItemType() {
+        return "DataSources";
     }
 
     /*
diff --git a/Core/src/org/sleuthkit/autopsy/datamodel/DeletedContent.java b/Core/src/org/sleuthkit/autopsy/datamodel/DeletedContent.java
index 57793840c5..a1bcfe3168 100644
--- a/Core/src/org/sleuthkit/autopsy/datamodel/DeletedContent.java
+++ b/Core/src/org/sleuthkit/autopsy/datamodel/DeletedContent.java
@@ -148,8 +148,8 @@ public class DeletedContent implements AutopsyVisitableItem {
         }
 
         @Override
-        public ItemType getItemType() {
-            return ItemType.DELETED_CONTENT;
+        public String getItemType() {
+            return "DeletedContent";
         }
     }
 
@@ -281,8 +281,8 @@ public class DeletedContent implements AutopsyVisitableItem {
             }
 
             @Override
-            public ItemType getItemType() {
-                return ItemType.DELETED_CONTENT_CHILDREN;
+            public String getItemType() {
+                return "DeletedContentChildren";
             }
 
             // update the display name when new events are fired
diff --git a/Core/src/org/sleuthkit/autopsy/datamodel/DirectoryNode.java b/Core/src/org/sleuthkit/autopsy/datamodel/DirectoryNode.java
index ca971d3e56..cf8e88c7b3 100755
--- a/Core/src/org/sleuthkit/autopsy/datamodel/DirectoryNode.java
+++ b/Core/src/org/sleuthkit/autopsy/datamodel/DirectoryNode.java
@@ -102,7 +102,7 @@ public class DirectoryNode extends AbstractFsContentNode<AbstractFile> {
     }
 
     @Override
-    public ItemType getItemType() {
-        return ItemType.DIRECTORY;
+    public String getItemType() {
+        return "Directory";
     }
 }
diff --git a/Core/src/org/sleuthkit/autopsy/datamodel/DisplayableItemNode.java b/Core/src/org/sleuthkit/autopsy/datamodel/DisplayableItemNode.java
index 616d79b111..d5a4de315e 100644
--- a/Core/src/org/sleuthkit/autopsy/datamodel/DisplayableItemNode.java
+++ b/Core/src/org/sleuthkit/autopsy/datamodel/DisplayableItemNode.java
@@ -41,85 +41,5 @@ public abstract class DisplayableItemNode extends AbstractNode {
 
     public abstract <T> T accept(DisplayableItemNodeVisitor<T> v);
     
-    public abstract ItemType getItemType();
-    
-    public enum ItemType {
-        GENERIC("Generic"),
-        BLACKBOARD_ARTIFACT("BlackboardArtifact"),
-        BLACKBOARD_ARTIFACT_TAG("BlackboardArtifactTag"),
-        CONTENT_TAG("ContentTag"),
-        DATA_SOURCES("DataSources"),
-        DELETED_CONTENT("DeletedContent"),
-        DELETED_CONTENT_CHILDREN("DeletedContentChildren"),
-        DIRECTORY("Directory"),
-        EMAIL_EXTRACTED_ROOT("EmailExtractedRoot"),
-        EMAIL_EXTRACTED_ACCOUNT("EmailExtractedAccount"),
-        EMAIL_EXTRACTED_FOLDER("EmailExtractedFolder"),
-        EXTRACTED_CONTENT_ROOT("ExtractedContentRoot"),
-        EXTRACTED_CONTENT_TYPE("ExtractedContentType"),
-        EXTRACTED_BOOKMARKS("ExtractedBookmarks"),
-        EXTRACTED_COOKIES("ExtractedCookies"),
-        EXTRACTED_HISTORY("ExtractedHistory"),
-        EXTRACTED_DOWNLOADS("ExtractedDownloads"),
-        EXTRACTED_PROGRAMS("ExtractedPrograms"),
-        EXTRACTED_RECENT("ExtractedRecent"),
-        EXTRACTED_ATTACHED_DEVICES("ExtractedAttachedDevices"),
-        EXTRACTED_SEARCH("ExtractedSearch"),
-        EXTRACTED_METADATA_EXIF("ExtractedMetadataExif"),
-        EXTRACTED_EMAIL_MSG("ExtractedEmailMsg"),
-        EXTRACTED_CONTACTS("ExtractedContacts"),
-        EXTRACTED_MESSAGES("ExtractedMessages"),
-        EXTRACTED_CALL_LOG("ExtractedCallLog"),
-        EXTRACTED_CALENDAR("ExtractedCalendar"),
-        EXTRACTED_SPEED_DIAL("ExtractedSpeedDial"),
-        EXTRACTED_BLUETOOTH("ExtractedBluetooth"),
-        EXTRACTED_GPS_BOOKMARKS("ExtractedGPSBookmarks"),
-        EXTRACTED_GPS_LAST_LOCATION("ExtractedGPSLastLocation"),
-        EXTRACTED_GPS_SEARCH("ExtractedGPSSearch"),
-        EXTRACTED_SERVICE_ACCOUNT("ExtractedServiceAccount"),
-        EXTRACTED_ENCRYPTION("ExtractedEncryption"),
-        EXTRACTED_EXT_MISMATCH("ExtractedExtMismatch"),
-        EXTRACTED_OS("ExtractedOS"),
-        EXTRACTED_FACE_DETECTED("ExtractedFaceDetected"),
-        FILE("File"),
-        FILE_SIZE_ROOT("FileSizeRoot"),
-        FILE_SIZE("FileSize"),
-        FILE_TYPE("FileType"),
-        FILE_TYPES("FileTypes"),
-        FILE_TYPES_DOC("FileTypesDoc"),
-        FILE_TYPES_EXE("FileTypesExe"),
-        HASHSET_ROOT("HashsetRoot"),
-        HASHSET_NAME("HashsetName"),
-        IMAGE("Image"),
-        INTERESTING_HITS_ROOT("InterestingHitsRoot"),
-        INTERESTING_HITS_SET_NAME("InterestingHitsSetName"),
-        KEYWORD_ROOT("KeywordRoot"),
-        KEYWORD_LIST("KeywordList"),
-        KEYWORD_TERM("KeywordTerm"),
-        LAYOUT_FILE("LayoutFile"),
-        LOCAL_FILE("LocalFile"),
-        RECENT_FILES("RecentFiles"),
-        RECENT_FILES_FILTER("RecentFilesFilter"),
-        REPORTS("Reports"),
-        REPORTS_LIST("ReportsList"),
-        RESULTS("Results"),
-        TAGS_ROOT("TagsRoots"),
-        TAGS_NAME("TagsName"),
-        TAGS_CONTENT_TYPE("TagsContentType"),
-        TAGS_BLACKBOARD_ARTIFACT("TagsBlackboardArtifact"),
-        VIEWS("Views"),
-        VIRTUAL_DIRECTORY("VirtualDirectory"),
-        VOLUME("Volume"),
-        EVENT("Event"),
-        EVENT_ROOT("EventRoot");
-
-        private final String name;
-        private ItemType(String name) {
-            this.name = name;
-        }
-        @Override
-        public String toString() {
-            return this.name;
-        }
-    }
+    public abstract String getItemType();
 }
diff --git a/Core/src/org/sleuthkit/autopsy/datamodel/EmailExtracted.java b/Core/src/org/sleuthkit/autopsy/datamodel/EmailExtracted.java
index 6a23b249bb..45532a8ab7 100644
--- a/Core/src/org/sleuthkit/autopsy/datamodel/EmailExtracted.java
+++ b/Core/src/org/sleuthkit/autopsy/datamodel/EmailExtracted.java
@@ -192,8 +192,8 @@ public class EmailExtracted implements AutopsyVisitableItem {
         }
 
         @Override
-        public ItemType getItemType() {
-            return ItemType.EMAIL_EXTRACTED_ROOT;
+        public String getItemType() {
+            return "EmailExtractedRoot";
         }
     }
 
@@ -347,8 +347,8 @@ public class EmailExtracted implements AutopsyVisitableItem {
         }
 
         @Override
-        public ItemType getItemType() {
-            return ItemType.EMAIL_EXTRACTED_ACCOUNT;
+        public String getItemType() {
+            return "EmailExtractedAccount";
         }
     }
 
@@ -438,8 +438,8 @@ public class EmailExtracted implements AutopsyVisitableItem {
         }
 
         @Override
-        public ItemType getItemType() {
-            return ItemType.EMAIL_EXTRACTED_FOLDER;
+        public String getItemType() {
+            return "EmailExtractedFolder";
         }
     }
 
diff --git a/Core/src/org/sleuthkit/autopsy/datamodel/ExtractedContent.java b/Core/src/org/sleuthkit/autopsy/datamodel/ExtractedContent.java
index 73924ef7c1..7654966472 100644
--- a/Core/src/org/sleuthkit/autopsy/datamodel/ExtractedContent.java
+++ b/Core/src/org/sleuthkit/autopsy/datamodel/ExtractedContent.java
@@ -120,8 +120,8 @@ public class ExtractedContent implements AutopsyVisitableItem {
         }
 
         @Override
-        public ItemType getItemType() {
-            return ItemType.EXTRACTED_CONTENT_ROOT;
+        public String getItemType() {
+            return "ExtractedContentRoot";
         }
     }
 
@@ -374,59 +374,59 @@ public class ExtractedContent implements AutopsyVisitableItem {
         }
 
         @Override
-        public ItemType getItemType() {
+        public String getItemType() {
             switch (type) {
                 case TSK_WEB_BOOKMARK:
-                    return ItemType.EXTRACTED_BOOKMARKS;
+                    return "ExtractedBookmarks";
                 case TSK_WEB_COOKIE:
-                    return ItemType.EXTRACTED_COOKIES;
+                    return "ExtractedCookies";
                 case TSK_WEB_HISTORY:
-                    return ItemType.EXTRACTED_HISTORY;
+                    return "ExtractedHistory";
                 case TSK_WEB_DOWNLOAD:
-                    return ItemType.EXTRACTED_DOWNLOADS;
+                    return "ExtractedDownloads";
                 case TSK_INSTALLED_PROG:
-                    return ItemType.EXTRACTED_PROGRAMS;
+                    return "ExtractedPrograms";
                 case TSK_RECENT_OBJECT:
-                    return ItemType.EXTRACTED_RECENT;
+                    return "ExtractedRecent";
                 case TSK_DEVICE_ATTACHED:
-                    return ItemType.EXTRACTED_ATTACHED_DEVICES;
+                    return "ExtractedAttachedDevices";
                 case TSK_WEB_SEARCH_QUERY:
-                    return ItemType.EXTRACTED_SEARCH;
+                    return "ExtractedSearch";
                 case TSK_METADATA_EXIF:
-                    return ItemType.EXTRACTED_METADATA_EXIF;
+                    return "ExtractedMetadataExif";
                 case TSK_EMAIL_MSG:
-                    return ItemType.EXTRACTED_EMAIL_MSG;
+                    return "ExtractedEmailMsg";
                 case TSK_CONTACT:
-                    return ItemType.EXTRACTED_CONTACTS;
+                    return "ExtractedContants";
                 case TSK_MESSAGE:
-                    return ItemType.EXTRACTED_MESSAGES;
+                    return "ExtractedMessages";
                 case TSK_CALLLOG:
-                    return ItemType.EXTRACTED_CALL_LOG;
+                    return "ExtractedCallLog";
                 case TSK_CALENDAR_ENTRY:
-                    return ItemType.EXTRACTED_CALENDAR;
+                    return "ExtractedCalendar";
                 case TSK_SPEED_DIAL_ENTRY:
-                    return ItemType.EXTRACTED_SPEED_DIAL;
+                    return "ExtractedSpeedDial";
                 case TSK_BLUETOOTH_PAIRING:
-                    return ItemType.EXTRACTED_BLUETOOTH;
+                    return "ExtractedBluetooth";
                 case TSK_GPS_BOOKMARK:
-                    return ItemType.EXTRACTED_GPS_BOOKMARKS;
+                    return "ExtractedGPSBookmarks";
                 case TSK_GPS_LAST_KNOWN_LOCATION:
-                    return ItemType.EXTRACTED_GPS_LAST_LOCATION;
+                    return "ExtractedGPSLastLocation";
                 case TSK_GPS_SEARCH:
-                    return ItemType.EXTRACTED_GPS_SEARCH;
+                    return "ExtractedGPSSearch";
                 case TSK_SERVICE_ACCOUNT:
-                    return ItemType.EXTRACTED_SERVICE_ACCOUNT;
+                    return "ExtractedServiceAccount";
                 case TSK_ENCRYPTION_DETECTED:
-                    return ItemType.EXTRACTED_ENCRYPTION;
+                    return "ExtractedEncryption";
                 case TSK_EXT_MISMATCH_DETECTED:
-                    return ItemType.EXTRACTED_EXT_MISMATCH;
+                    return "ExtractedExtMismatch";
                 case TSK_OS_INFO:
-                    return ItemType.EXTRACTED_OS;
+                    return "ExtractedOS";
                 case TSK_FACE_DETECTED:
-                    return ItemType.EXTRACTED_FACE_DETECTED;
+                    return "ExtractedFaceDetected";
 
             }
-            return ItemType.EXTRACTED_CONTENT_TYPE;
+            return "ExtractedContentType";
         }
     }
 
diff --git a/Core/src/org/sleuthkit/autopsy/datamodel/FileNode.java b/Core/src/org/sleuthkit/autopsy/datamodel/FileNode.java
index 44fdc366dc..53c9270494 100755
--- a/Core/src/org/sleuthkit/autopsy/datamodel/FileNode.java
+++ b/Core/src/org/sleuthkit/autopsy/datamodel/FileNode.java
@@ -185,7 +185,7 @@ public class FileNode extends AbstractFsContentNode<AbstractFile> {
     }
 
     @Override
-    public ItemType getItemType() {
-        return ItemType.FILE;
+    public String getItemType() {
+        return "File";
     }
 }
diff --git a/Core/src/org/sleuthkit/autopsy/datamodel/FileSize.java b/Core/src/org/sleuthkit/autopsy/datamodel/FileSize.java
index be47ef4596..587037fb24 100644
--- a/Core/src/org/sleuthkit/autopsy/datamodel/FileSize.java
+++ b/Core/src/org/sleuthkit/autopsy/datamodel/FileSize.java
@@ -145,8 +145,8 @@ public class FileSize implements AutopsyVisitableItem {
         }
 
         @Override
-        public ItemType getItemType() {
-            return ItemType.FILE_SIZE_ROOT;
+        public String getItemType() {
+            return "FileSizeRoot";
         }
     }
 
@@ -287,8 +287,8 @@ public class FileSize implements AutopsyVisitableItem {
             }
 
             @Override
-            public ItemType getItemType() {
-                return ItemType.FILE_SIZE;
+            public String getItemType() {
+                return "FileSize";
             }
 
             // update the display name when new events are fired
diff --git a/Core/src/org/sleuthkit/autopsy/datamodel/FileTypeNode.java b/Core/src/org/sleuthkit/autopsy/datamodel/FileTypeNode.java
index ba8c69cf69..d2cb20d2c6 100644
--- a/Core/src/org/sleuthkit/autopsy/datamodel/FileTypeNode.java
+++ b/Core/src/org/sleuthkit/autopsy/datamodel/FileTypeNode.java
@@ -83,8 +83,8 @@ public class FileTypeNode extends DisplayableItemNode {
     }
 
     @Override
-    public ItemType getItemType() {
-        return ItemType.FILE_TYPE;
+    public String getItemType() {
+        return "FileType";
     }
 
     // update the display name when new events are fired
diff --git a/Core/src/org/sleuthkit/autopsy/datamodel/FileTypesNode.java b/Core/src/org/sleuthkit/autopsy/datamodel/FileTypesNode.java
index 060619ab81..24e7cd18f5 100644
--- a/Core/src/org/sleuthkit/autopsy/datamodel/FileTypesNode.java
+++ b/Core/src/org/sleuthkit/autopsy/datamodel/FileTypesNode.java
@@ -105,14 +105,14 @@ public class FileTypesNode extends DisplayableItemNode {
     }
 
     @Override
-    public ItemType getItemType() {
+    public String getItemType() {
         if(filter == null)
-            return ItemType.FILE_TYPES;
+            return "FileTypes";
         if (filter.equals(FileTypeExtensionFilters.RootFilter.TSK_DOCUMENT_FILTER))
-            return ItemType.FILE_TYPES_DOC;
+            return "FileTypesDoc";
         if (filter.equals(FileTypeExtensionFilters.RootFilter.TSK_EXECUTABLE_FILTER))
-            return ItemType.FILE_TYPES_EXE;
-        return ItemType.FILE_TYPES;
+            return "FileTypesExe";
+        return "FileTypes";
     }
 
     /**
diff --git a/Core/src/org/sleuthkit/autopsy/datamodel/HashsetHits.java b/Core/src/org/sleuthkit/autopsy/datamodel/HashsetHits.java
index 0b58c57cc5..3f1e3301a6 100644
--- a/Core/src/org/sleuthkit/autopsy/datamodel/HashsetHits.java
+++ b/Core/src/org/sleuthkit/autopsy/datamodel/HashsetHits.java
@@ -170,8 +170,8 @@ public class HashsetHits implements AutopsyVisitableItem {
         }
 
         @Override
-        public ItemType getItemType() {
-            return ItemType.HASHSET_ROOT;
+        public String getItemType() {
+            return "HashsetRoot";
         }
     }
 
@@ -328,8 +328,8 @@ public class HashsetHits implements AutopsyVisitableItem {
         }
 
         @Override
-        public ItemType getItemType() {
-            return ItemType.HASHSET_NAME;
+        public String getItemType() {
+            return "HashsetName";
         }
     }
 
diff --git a/Core/src/org/sleuthkit/autopsy/datamodel/ImageNode.java b/Core/src/org/sleuthkit/autopsy/datamodel/ImageNode.java
index 495fc96bdd..49ec5214c9 100644
--- a/Core/src/org/sleuthkit/autopsy/datamodel/ImageNode.java
+++ b/Core/src/org/sleuthkit/autopsy/datamodel/ImageNode.java
@@ -111,7 +111,7 @@ public class ImageNode extends AbstractContentNode<Image> {
     }
 
     @Override
-    public ItemType getItemType() {
-        return ItemType.IMAGE;
+    public String getItemType() {
+        return "Image";
     }
 }
diff --git a/Core/src/org/sleuthkit/autopsy/datamodel/InterestingHits.java b/Core/src/org/sleuthkit/autopsy/datamodel/InterestingHits.java
index 178768069a..b71847bae0 100644
--- a/Core/src/org/sleuthkit/autopsy/datamodel/InterestingHits.java
+++ b/Core/src/org/sleuthkit/autopsy/datamodel/InterestingHits.java
@@ -163,8 +163,8 @@ public class InterestingHits implements AutopsyVisitableItem {
         }
 
         @Override
-        public ItemType getItemType() {
-            return ItemType.INTERESTING_HITS_ROOT;
+        public String getItemType() {
+            return "InterestingHitsRoot";
         }
     }
 
@@ -314,8 +314,8 @@ public class InterestingHits implements AutopsyVisitableItem {
         }
 
         @Override
-        public ItemType getItemType() {
-            return ItemType.INTERESTING_HITS_SET_NAME;
+        public String getItemType() {
+            return "InterestingHitsSetName";
         }
     }
 
diff --git a/Core/src/org/sleuthkit/autopsy/datamodel/KeywordHits.java b/Core/src/org/sleuthkit/autopsy/datamodel/KeywordHits.java
index d86565da3f..9bbe7b9c44 100644
--- a/Core/src/org/sleuthkit/autopsy/datamodel/KeywordHits.java
+++ b/Core/src/org/sleuthkit/autopsy/datamodel/KeywordHits.java
@@ -241,8 +241,8 @@ public class KeywordHits implements AutopsyVisitableItem {
         }
 
         @Override
-        public ItemType getItemType() {
-            return ItemType.KEYWORD_ROOT;
+        public String getItemType() {
+            return "KeywordRoot";
         }
     }
 
@@ -396,8 +396,8 @@ public class KeywordHits implements AutopsyVisitableItem {
         }
 
         @Override
-        public ItemType getItemType() {
-            return ItemType.KEYWORD_LIST;
+        public String getItemType() {
+            return "KeywordList";
         }
     }
 
@@ -494,8 +494,8 @@ public class KeywordHits implements AutopsyVisitableItem {
         }
 
         @Override
-        public ItemType getItemType() {
-            return ItemType.KEYWORD_TERM;
+        public String getItemType() {
+            return "KeywordTerm";
         }
     }
 
diff --git a/Core/src/org/sleuthkit/autopsy/datamodel/LayoutFileNode.java b/Core/src/org/sleuthkit/autopsy/datamodel/LayoutFileNode.java
index 39a95726d0..ef6ab09c02 100644
--- a/Core/src/org/sleuthkit/autopsy/datamodel/LayoutFileNode.java
+++ b/Core/src/org/sleuthkit/autopsy/datamodel/LayoutFileNode.java
@@ -39,8 +39,8 @@ import org.sleuthkit.datamodel.TskData;
 public class LayoutFileNode extends AbstractAbstractFileNode<LayoutFile> {
 
     @Override
-    public ItemType getItemType() {
-        return ItemType.LAYOUT_FILE;
+    public String getItemType() {
+        return "LayoutFile";
     }
 
     public static enum LayoutContentPropertyType {
diff --git a/Core/src/org/sleuthkit/autopsy/datamodel/LocalFileNode.java b/Core/src/org/sleuthkit/autopsy/datamodel/LocalFileNode.java
index c51dd24c02..04c542bfc7 100644
--- a/Core/src/org/sleuthkit/autopsy/datamodel/LocalFileNode.java
+++ b/Core/src/org/sleuthkit/autopsy/datamodel/LocalFileNode.java
@@ -117,7 +117,7 @@ public class LocalFileNode extends AbstractAbstractFileNode<AbstractFile> {
     }
 
     @Override
-    public ItemType getItemType() {
-        return ItemType.LOCAL_FILE;
+    public String getItemType() {
+        return "LocalFile";
     }
 }
diff --git a/Core/src/org/sleuthkit/autopsy/datamodel/RecentFilesFilterNode.java b/Core/src/org/sleuthkit/autopsy/datamodel/RecentFilesFilterNode.java
index 8673af9092..832d385cfe 100644
--- a/Core/src/org/sleuthkit/autopsy/datamodel/RecentFilesFilterNode.java
+++ b/Core/src/org/sleuthkit/autopsy/datamodel/RecentFilesFilterNode.java
@@ -84,7 +84,7 @@ public class RecentFilesFilterNode extends DisplayableItemNode {
     }
 
     @Override
-    public ItemType getItemType() {
-        return ItemType.RECENT_FILES_FILTER;
+    public String getItemType() {
+        return "RecentFilesFilter";
     }
 }
diff --git a/Core/src/org/sleuthkit/autopsy/datamodel/RecentFilesNode.java b/Core/src/org/sleuthkit/autopsy/datamodel/RecentFilesNode.java
index 7c61c5faaf..8fcb72d7cb 100644
--- a/Core/src/org/sleuthkit/autopsy/datamodel/RecentFilesNode.java
+++ b/Core/src/org/sleuthkit/autopsy/datamodel/RecentFilesNode.java
@@ -67,7 +67,7 @@ public class RecentFilesNode extends DisplayableItemNode {
     }
 
     @Override
-    public ItemType getItemType() {
-        return ItemType.RECENT_FILES;
+    public String getItemType() {
+        return "RecentFiles";
     }
 }
diff --git a/Core/src/org/sleuthkit/autopsy/datamodel/Reports.java b/Core/src/org/sleuthkit/autopsy/datamodel/Reports.java
index a2c9fb8680..bcf5d7b266 100755
--- a/Core/src/org/sleuthkit/autopsy/datamodel/Reports.java
+++ b/Core/src/org/sleuthkit/autopsy/datamodel/Reports.java
@@ -90,8 +90,8 @@ public final class Reports implements AutopsyVisitableItem {
         }
 
         @Override
-        public ItemType getItemType() {
-            return ItemType.REPORTS_LIST;
+        public String getItemType() {
+            return "ReportsList";
         }
     }
 
@@ -215,8 +215,8 @@ public final class Reports implements AutopsyVisitableItem {
         }
 
         @Override
-        public ItemType getItemType() {
-            return ItemType.REPORTS;
+        public String getItemType() {
+            return "Reports";
         }
 
         private static class DeleteReportAction extends AbstractAction {
diff --git a/Core/src/org/sleuthkit/autopsy/datamodel/ResultsNode.java b/Core/src/org/sleuthkit/autopsy/datamodel/ResultsNode.java
index ba1bbf2de6..46e4853e0b 100644
--- a/Core/src/org/sleuthkit/autopsy/datamodel/ResultsNode.java
+++ b/Core/src/org/sleuthkit/autopsy/datamodel/ResultsNode.java
@@ -70,7 +70,7 @@ public class ResultsNode extends DisplayableItemNode {
     }
 
     @Override
-    public ItemType getItemType() {
-        return ItemType.RESULTS;
+    public String getItemType() {
+        return "Results";
     }
 }
diff --git a/Core/src/org/sleuthkit/autopsy/datamodel/Tags.java b/Core/src/org/sleuthkit/autopsy/datamodel/Tags.java
index 6d52e29e1b..1b013baf5c 100755
--- a/Core/src/org/sleuthkit/autopsy/datamodel/Tags.java
+++ b/Core/src/org/sleuthkit/autopsy/datamodel/Tags.java
@@ -110,8 +110,8 @@ public class Tags implements AutopsyVisitableItem {
         }
 
         @Override
-        public ItemType getItemType() {
-            return ItemType.TAGS_ROOT;
+        public String getItemType() {
+            return "TagsRoots";
         }
     }
 
@@ -272,8 +272,8 @@ public class Tags implements AutopsyVisitableItem {
         }
 
         @Override
-        public ItemType getItemType() {
-            return ItemType.TAGS_NAME;
+        public String getItemType() {
+            return "TagsName";
         }
     }
 
@@ -372,8 +372,8 @@ public class Tags implements AutopsyVisitableItem {
         }
 
         @Override
-        public ItemType getItemType() {
-            return ItemType.TAGS_CONTENT_TYPE;
+        public String getItemType() {
+            return "TagsContentType";
         }
     }
 
@@ -470,8 +470,8 @@ public class Tags implements AutopsyVisitableItem {
         }
 
         @Override
-        public ItemType getItemType() {
-            return ItemType.TAGS_BLACKBOARD_ARTIFACT;
+        public String getItemType() {
+            return "TagsBlackboardArtifact";
         }
     }
 
diff --git a/Core/src/org/sleuthkit/autopsy/datamodel/ViewsNode.java b/Core/src/org/sleuthkit/autopsy/datamodel/ViewsNode.java
index 0ecbccae08..08c2e6b806 100644
--- a/Core/src/org/sleuthkit/autopsy/datamodel/ViewsNode.java
+++ b/Core/src/org/sleuthkit/autopsy/datamodel/ViewsNode.java
@@ -74,7 +74,7 @@ public class ViewsNode extends DisplayableItemNode {
     }
 
     @Override
-    public ItemType getItemType() {
-        return ItemType.VIEWS;
+    public String getItemType() {
+        return "Views";
     }
 }
diff --git a/Core/src/org/sleuthkit/autopsy/datamodel/VirtualDirectoryNode.java b/Core/src/org/sleuthkit/autopsy/datamodel/VirtualDirectoryNode.java
index cae015f1e2..5900487444 100644
--- a/Core/src/org/sleuthkit/autopsy/datamodel/VirtualDirectoryNode.java
+++ b/Core/src/org/sleuthkit/autopsy/datamodel/VirtualDirectoryNode.java
@@ -150,7 +150,7 @@ public class VirtualDirectoryNode extends AbstractAbstractFileNode<VirtualDirect
     }
 
     @Override
-    public ItemType getItemType() {
-        return ItemType.VIRTUAL_DIRECTORY;
+    public String getItemType() {
+        return "VirtualDirectory";
     }
 }
diff --git a/Core/src/org/sleuthkit/autopsy/datamodel/VolumeNode.java b/Core/src/org/sleuthkit/autopsy/datamodel/VolumeNode.java
index 57f5afaa4f..51b4ada972 100644
--- a/Core/src/org/sleuthkit/autopsy/datamodel/VolumeNode.java
+++ b/Core/src/org/sleuthkit/autopsy/datamodel/VolumeNode.java
@@ -191,7 +191,7 @@ public class VolumeNode extends AbstractContentNode<Volume> {
     }
 
     @Override
-    public ItemType getItemType() {
-        return ItemType.VOLUME;
+    public String getItemType() {
+        return "Volume";
     }
 }