diff --git a/Experimental/src/org/sleuthkit/autopsy/experimental/configuration/AutoIngestUserPreferences.java b/Experimental/src/org/sleuthkit/autopsy/experimental/configuration/AutoIngestUserPreferences.java
index f6b7dd2716..cc80451a72 100644
--- a/Experimental/src/org/sleuthkit/autopsy/experimental/configuration/AutoIngestUserPreferences.java
+++ b/Experimental/src/org/sleuthkit/autopsy/experimental/configuration/AutoIngestUserPreferences.java
@@ -39,7 +39,7 @@ public final class AutoIngestUserPreferences {
     };
 
     private static final Preferences preferences = NbPreferences.forModule(AutoIngestUserPreferences.class);
-    private static final String MODE = "Mode"; // NON-NLS
+    private static final String MODE = "AutopsyMode"; // NON-NLS
     private static final String AUTO_MODE_IMAGES_FOLDER = "AutoModeImageFolder"; // NON-NLS
     private static final String AUTO_MODE_RESULTS_FOLDER = "AutoModeResultsFolder"; // NON-NLS
     private static final String SHARED_CONFIG_FOLDER = "SharedSettingsFolder"; // NON-NLS
diff --git a/Experimental/src/org/sleuthkit/autopsy/experimental/configuration/Bundle.properties b/Experimental/src/org/sleuthkit/autopsy/experimental/configuration/Bundle.properties
index 985367eb6e..4ddd9962a6 100644
--- a/Experimental/src/org/sleuthkit/autopsy/experimental/configuration/Bundle.properties
+++ b/Experimental/src/org/sleuthkit/autopsy/experimental/configuration/Bundle.properties
@@ -32,7 +32,7 @@ OptionsPanel.validationErrMsg.invalidDatabasePort=Invalid database port number
 OptionsPanel.validationErrMsg.invalidMessageServicePort=Invalid message service port number
 OptionsPanel.validationErrMsg.invalidIndexingServerPort=Invalid Solr server port number
 OptionsPanel.ErrorSettingDefaultFolder=Error creating default folder
-OpenOptionsPanelAction.name=Options
+OpenOptionsPanelAction.name=Auto Ingest Options
 OptionsPanel.KeywordSearchNull=Cannot find Keyword Search service
 OptionsPanel.InvalidPortNumber=Invalid port number.
 OptionsPanel.AdvancedOptionsPanel.Title=Advanced Settings
diff --git a/Experimental/src/org/sleuthkit/autopsy/experimental/configuration/OptionsDialog.java b/Experimental/src/org/sleuthkit/autopsy/experimental/configuration/OptionsDialog.java
index e17300bde6..4d6f8b9b2c 100644
--- a/Experimental/src/org/sleuthkit/autopsy/experimental/configuration/OptionsDialog.java
+++ b/Experimental/src/org/sleuthkit/autopsy/experimental/configuration/OptionsDialog.java
@@ -35,7 +35,7 @@ import org.openide.util.ImageUtilities;
  */
 public class OptionsDialog extends JDialog {
 
-    private static final String TITLE = "Options";
+    private static final String TITLE = "Auto Ingest Options";
     private static final long serialVersionUID = 1L;
 
     /**