diff --git a/Core/src/org/sleuthkit/autopsy/casemodule/Case.java b/Core/src/org/sleuthkit/autopsy/casemodule/Case.java
index 3709654e24..5596b2af14 100755
--- a/Core/src/org/sleuthkit/autopsy/casemodule/Case.java
+++ b/Core/src/org/sleuthkit/autopsy/casemodule/Case.java
@@ -998,6 +998,16 @@ public class Case {
         }
     }
 
+    private static String getNameForTitle(){
+        if (UserPreferences.getAppName().equals(Version.getName())){
+            //Available version number is version number for this application
+            return String.format("%s %s", UserPreferences.getAppName(), Version.getVersion());
+        }
+        else {
+            return UserPreferences.getAppName();
+        }
+    }
+    
     /**
      * Update the GUI to to reflect the current case.
      */
@@ -1074,7 +1084,7 @@ public class Case {
                  *
                  * [curent case display name] - [application name].
                  */
-                mainFrame.setTitle(newCurrentCase.getDisplayName() + " - " + UserPreferences.getAppName());
+                mainFrame.setTitle(newCurrentCase.getDisplayName() + " - " + getNameForTitle());
             });
         }
     }
@@ -1112,7 +1122,7 @@ public class Case {
                  * Reset the main window title to be just the application name,
                  * instead of [curent case display name] - [application name].
                  */
-                mainFrame.setTitle(UserPreferences.getAppName());
+                mainFrame.setTitle(getNameForTitle());
             });
         }
     }
@@ -1592,7 +1602,7 @@ public class Case {
         eventPublisher.publish(new AutopsyEvent(Events.CASE_DETAILS.toString(), oldCaseDetails, caseDetails));
         if (RuntimeProperties.runningWithGUI()) {
             SwingUtilities.invokeLater(() -> {
-                mainFrame.setTitle(caseDetails.getCaseDisplayName() + " - " + UserPreferences.getAppName());
+                mainFrame.setTitle(caseDetails.getCaseDisplayName() + " - " + getNameForTitle());
                 try {
                     RecentCases.getInstance().updateRecentCase(oldCaseDetails.getCaseDisplayName(), metadata.getFilePath().toString(), caseDetails.getCaseDisplayName(), metadata.getFilePath().toString());
                 } catch (Exception ex) {
diff --git a/Core/src/org/sleuthkit/autopsy/core/UserPreferences.java b/Core/src/org/sleuthkit/autopsy/core/UserPreferences.java
index 86f68e1df5..78de67766b 100755
--- a/Core/src/org/sleuthkit/autopsy/core/UserPreferences.java
+++ b/Core/src/org/sleuthkit/autopsy/core/UserPreferences.java
@@ -357,7 +357,7 @@ public final class UserPreferences {
      * @return Name of this program
      */
     public static String getAppName() {
-        return preferences.get(APP_NAME, String.format("%s %s", Version.getName(), Version.getVersion()));
+        return preferences.get(APP_NAME, "Autopsy");
     }
 
     /**
diff --git a/Core/src/org/sleuthkit/autopsy/corecomponents/AutopsyOptionsPanel.java b/Core/src/org/sleuthkit/autopsy/corecomponents/AutopsyOptionsPanel.java
index a9640f005e..334f4b6e15 100755
--- a/Core/src/org/sleuthkit/autopsy/corecomponents/AutopsyOptionsPanel.java
+++ b/Core/src/org/sleuthkit/autopsy/corecomponents/AutopsyOptionsPanel.java
@@ -188,7 +188,7 @@ final class AutopsyOptionsPanel extends javax.swing.JPanel {
      * @throws IOException when the file does not exist.
      */
     private static File getInstallFolderConfFile() throws IOException {
-        String confFileName = Version.getName() + CONFIG_FILE_EXTENSION;
+        String confFileName = UserPreferences.getAppName() + CONFIG_FILE_EXTENSION;
         String installFolder = PlatformUtil.getInstallPath();
         File installFolderEtc = new File(installFolder, ETC_FOLDER_NAME);
         File installFolderConfigFile = new File(installFolderEtc, confFileName);