diff --git a/sift/scripts/image-mounter.sls b/sift/scripts/image-mounter.sls
index 0a04669..22e6242 100644
--- a/sift/scripts/image-mounter.sls
+++ b/sift/scripts/image-mounter.sls
@@ -1,5 +1,5 @@
 # Source: https://github.com/kevthehermit/Scripts
-scripts-image-mounter:
+sift-scripts-image-mounter:
   file.managed:
     - name: /usr/local/bin/imageMounter.py
     - source: https://raw.githubusercontent.com/kevthehermit/Scripts/master/imageMounter.py
diff --git a/sift/scripts/regripper.sls b/sift/scripts/regripper.sls
index 1f9695e..3cd2672 100644
--- a/sift/scripts/regripper.sls
+++ b/sift/scripts/regripper.sls
@@ -17,12 +17,20 @@ scripts-regripper-files:
 
 scripts-regripper-binary:
   file.managed:
-    - name: /usr/local/bin/rip.pl
+    - name: /usr/share/regripper/rip.pl
     - source: salt://sift/files/regripper/rip.pl
-    - file_mode: 755
+    - mode: 755
     - require:
       - file: scripts-regripper-files
 
+scripts-regripper-symlink:
+  file.symlink:
+    - name: /usr/local/bin/rip.pl
+    - target: /usr/share/regripper/rip.pl
+    - mode: 755
+    - require:
+      - file: scripts-regripper-binary
+
 scripts-regripper-dos2unix:
   cmd.run:
     - name: dos2unix -ascii /usr/share/regripper/*
diff --git a/sift/scripts/rfc.sls b/sift/scripts/rfc.sls
index d97b392..88ae65c 100644
--- a/sift/scripts/rfc.sls
+++ b/sift/scripts/rfc.sls
@@ -2,4 +2,4 @@ sift-scripts-rfc:
   file.managed:
     - name: /usr/local/bin/rfc.pl
     - source: salt://sift/files/scripts/rfc.pl
-    - file_mode: 755
+    - mode: 755
diff --git a/sift/scripts/shim-cache-parser.sls b/sift/scripts/shim-cache-parser.sls
index 021a558..d4d8bb1 100644
--- a/sift/scripts/shim-cache-parser.sls
+++ b/sift/scripts/shim-cache-parser.sls
@@ -4,7 +4,7 @@ include:
   - sift.python-packages.python-registry
 
 # Source: https://github.com/kevthehermit/Scripts
-scripts-image-mounter:
+sift-scripts-shim-cache-parser:
   file.managed:
     - name: /usr/local/bin/ShimCacheParser.py
     - source: https://raw.githubusercontent.com/mandiant/ShimCacheParser/{{ commit }}/ShimCacheParser.py