diff --git a/Core/build.xml b/Core/build.xml
index 9fb2bedd6e..085e7b0bc7 100644
--- a/Core/build.xml
+++ b/Core/build.xml
@@ -6,7 +6,7 @@
     <description>Builds, tests, and runs the project org.sleuthkit.autopsy.core</description>
     <import file="nbproject/build-impl.xml"/>
     <import file="../BootstrapIvy.xml"/>
-    <import file="../TSK_VERSION.xml"/>
+    <import file="../TSKVersion.xml"/>
      
      
     <property name="thirdparty.dir" value="${basedir}/../thirdparty" />
@@ -18,8 +18,7 @@
             <fileset dir="{basedir}/../../InternalPythonModules"/>
         </copy>
     </target>
-	
-    <replaceregexp file="${basedir}/../unix_setup.sh" match="TSK_VERSION=(.*)" replace="TSK_VERSION=${TSK_VERSION}" byline="true"/>
+
     <target name="get-thirdparty-dependencies" description="get third-party dependencies"> 
         <!--Copy openCV dependencies to release-->
         <copy todir="${modules.dir}" >
diff --git a/TSK_VERSION.xml b/TSKVersion.xml
similarity index 100%
rename from TSK_VERSION.xml
rename to TSKVersion.xml
diff --git a/build.xml b/build.xml
index 396268f50e..fc3e2b673f 100644
--- a/build.xml
+++ b/build.xml
@@ -6,7 +6,7 @@
     <description>Builds the module suite Autopsy 4.</description>
 	
     <import file="nbproject/build-impl.xml"/>
-    <import file="${basedir}/TSK_VERSION.xml"/>
+    <import file="${basedir}/TSKVersion.xml"/>
     <!-- IMPORTANT: nbproject/platform.properties has a netbeans-plat-version property that MUST be kept in sync (manually) -->
     <property name="netbeans-plat-version" value="8.2" />
     <property name="nbplatform.active.dir" value="${basedir}/netbeans-plat/${netbeans-plat-version}" />
@@ -90,6 +90,7 @@
         <if>
             <equals arg1="${os.family}" arg2="unix"/>
             <then>
+                <replaceregexp file="${basedir}/unix_setup.sh" match="TSK_VERSION=(.*)" replace="TSK_VERSION=${TSK_VERSION}" byline="true"/>
                 <copy file="${basedir}/unix_setup.sh" tofile="${zip-tmp}/${app.name}/unix_setup.sh"/>
             </then>
         </if>
diff --git a/unix_setup.sh b/unix_setup.sh
index 41c57355de..15f750f880 100644
--- a/unix_setup.sh
+++ b/unix_setup.sh
@@ -23,10 +23,10 @@ if [[ -f "$sleuthkit_jar_filepath" ]]; then
         	echo "Successfully removed $ext_jar_filepath"
         	cp $sleuthkit_jar_filepath $ext_jar_filepath
         	if [ "$?" -eq 0 ]; then # checking copy operation was successful
-            	echo "Successfully copied $sleuthkit_jar_filepath"
+            		echo "Successfully copied $sleuthkit_jar_filepath"
         	else
-        	echo "exiting..."
-        	exit 1
+        		echo "exiting..."
+        		exit 1
         	fi
     	fi
 else
@@ -35,4 +35,3 @@ else
 fi
 
 echo "Autopsy is now configured. You can execute bin/autopsy to start it"
-