diff --git a/Core/src/org/sleuthkit/autopsy/modules/interestingitems/Bundle.properties b/Core/src/org/sleuthkit/autopsy/modules/interestingitems/Bundle.properties
index c15d823cca..7a25a4305c 100755
--- a/Core/src/org/sleuthkit/autopsy/modules/interestingitems/Bundle.properties
+++ b/Core/src/org/sleuthkit/autopsy/modules/interestingitems/Bundle.properties
@@ -2,6 +2,8 @@ OpenIDE-Module-Display-Category=Ingest Module
 OpenIDE-Module-Long-Description=Interesting Files Identifier ingest module. \n\n Identifies interesting files as defined by interesting files rule sets.
 OpenIDE-Module-Short-Description=Interesting Files Identifier ingest module.
 OpenIDE-Module-Name=Interesting Files Identifier
+OptionsCategory_Name_InterestingItemDefinitions=Interesting Item Definitions
+OptionsCategory_Keywords_InterestingItemDefinitions=InterestingItemDefinitions
 InterestingItemsIdentifierIngestModule.moduleName=Interesting Files Identifier
 InterestingItemsIdentifierIngestModule.moduleDescription=Identifies interesting items as defined by interesting item rule sets.
 InterestingItemDefsPanel.newSetButton.text=New Set
diff --git a/Core/src/org/sleuthkit/autopsy/modules/interestingitems/InterestingItemDefsOptionsPanelController.java b/Core/src/org/sleuthkit/autopsy/modules/interestingitems/InterestingItemDefsOptionsPanelController.java
index c95bffb053..c845bb71e0 100755
--- a/Core/src/org/sleuthkit/autopsy/modules/interestingitems/InterestingItemDefsOptionsPanelController.java
+++ b/Core/src/org/sleuthkit/autopsy/modules/interestingitems/InterestingItemDefsOptionsPanelController.java
@@ -33,7 +33,6 @@ import org.openide.util.Lookup;
         keywordsCategory = "InterestingItemDefinitions",
         position = 5
 )
-@org.openide.util.NbBundle.Messages({"OptionsCategory_Name_InterestingItemDefinitions=Interesting Item Definitions", "OptionsCategory_Keywords_InterestingItemDefinitions=InterestingItemDefinitions"})
 public final class InterestingItemDefsOptionsPanelController extends OptionsPanelController {
 
     private InterestingItemDefsPanel panel;
diff --git a/Core/src/org/sleuthkit/autopsy/timeline/events/type/MiscTypes.java b/Core/src/org/sleuthkit/autopsy/timeline/events/type/MiscTypes.java
index 5555b0ce2c..68851e9caf 100644
--- a/Core/src/org/sleuthkit/autopsy/timeline/events/type/MiscTypes.java
+++ b/Core/src/org/sleuthkit/autopsy/timeline/events/type/MiscTypes.java
@@ -62,7 +62,7 @@ public enum MiscTypes implements EventType, ArtifactEventType {
                   final BlackboardAttribute longEnd = attrMap.get(BlackboardAttribute.ATTRIBUTE_TYPE.TSK_GEO_LONGITUDE_END);
                   return String.format("from %1$g %2$g to %3$g %4$g", latStart.getValueDouble(), longStart.getValueDouble(), latEnd.getValueDouble(), longEnd.getValueDouble());
               }),
-    GPS_TRACKPOINT("Location History", "gps_trackpoint.png",
+    GPS_TRACKPOINT("Location History", "gps-trackpoint.png",
                    BlackboardArtifact.ARTIFACT_TYPE.TSK_GPS_TRACKPOINT,
                    BlackboardAttribute.ATTRIBUTE_TYPE.TSK_DATETIME,
                    new AttributeExtractor(BlackboardAttribute.ATTRIBUTE_TYPE.TSK_PROG_NAME),