diff --git a/Core/src/org/sleuthkit/autopsy/core/Installer.java b/Core/src/org/sleuthkit/autopsy/core/Installer.java
index e8b1c79196..374d5b8ccb 100644
--- a/Core/src/org/sleuthkit/autopsy/core/Installer.java
+++ b/Core/src/org/sleuthkit/autopsy/core/Installer.java
@@ -67,7 +67,7 @@ public class Installer extends ModuleInstall {
     private static final long serialVersionUID = 1L;
 
     private static final String JAVA_TEMP = "java.io.tmpdir";
-    private static final String AUTOPSY_TEMP_DIR = "autopsy_temp";
+    private static final String AUTOPSY_TEMP_DIR_SUFFIX = "_temp";
     private static final String TSK_TEMP = "tsk.tmpdir";
     
     private final List<ModuleInstall> packageInstallers;
@@ -93,7 +93,8 @@ public class Installer extends ModuleInstall {
     private static void setTskTemp() {
         try {
             String curTemp = System.getProperty(JAVA_TEMP, "");
-            String tskTemp = curTemp + (curTemp.endsWith(File.separator) ? "" : File.separator) + AUTOPSY_TEMP_DIR;
+            String autopsyTempDir = StringUtils.defaultIfBlank(UserPreferences.getAppName(), "autopsy").replaceAll("[^a-zA-Z0-9_\\-]", "_") + AUTOPSY_TEMP_DIR_SUFFIX;
+            String tskTemp = Paths.get(StringUtils.defaultString(curTemp), autopsyTempDir).toString();
             System.setProperty(TSK_TEMP, tskTemp);
             File tskTempDir = new File(tskTemp);
             tskTempDir.mkdirs();
diff --git a/thirdparty/pasco2/.project b/thirdparty/pasco2/.project
index 454c782dbe..17a0007916 100644
--- a/thirdparty/pasco2/.project
+++ b/thirdparty/pasco2/.project
@@ -21,6 +21,17 @@
 			<location>C:/Development/42six/trunk/thirdparty/pasco2/lib</location>
 		</link>
 	</linkedResources>
+	<filteredResources>
+		<filter>
+			<id>1715884364848</id>
+			<name></name>
+			<type>30</type>
+			<matcher>
+				<id>org.eclipse.core.resources.regexFilterMatcher</id>
+				<arguments>node_modules|\.git|__CREATED_BY_JAVA_LANGUAGE_SERVER__</arguments>
+			</matcher>
+		</filter>
+	</filteredResources>
 	<variableList>
 		<variable>
 			<name>BIN_DIR</name>