diff --git a/code/client/app_usage_monitor b/code/client/app_usage_monitor
index 3bb09e7d..41f22b51 100755
--- a/code/client/app_usage_monitor
+++ b/code/client/app_usage_monitor
@@ -1,4 +1,4 @@
-#!/usr/local/munki/munki-python
+#!/usr/local/munki/python
 # encoding: utf-8
 #
 # Copyright 2017-2020 Greg Neagle.
diff --git a/code/client/appusaged b/code/client/appusaged
index 2b08ab4a..ed6ac2c3 100755
--- a/code/client/appusaged
+++ b/code/client/appusaged
@@ -1,4 +1,4 @@
-#!/usr/local/munki/munki-python
+#!/usr/local/munki/python
 # encoding: utf-8
 #
 # Copyright 2018-2020 Greg Neagle.
diff --git a/code/client/authrestartd b/code/client/authrestartd
index bbe54b29..ee2759a1 100755
--- a/code/client/authrestartd
+++ b/code/client/authrestartd
@@ -1,4 +1,4 @@
-#!/usr/local/munki/munki-python
+#!/usr/local/munki/python
 # encoding: utf-8
 #
 # Copyright 2017-2020 Greg Neagle.
diff --git a/code/client/iconimporter b/code/client/iconimporter
index 49e768a4..695f544c 100755
--- a/code/client/iconimporter
+++ b/code/client/iconimporter
@@ -1,4 +1,4 @@
-#!/usr/local/munki/munki-python
+#!/usr/local/munki/python
 # encoding: utf-8
 #
 # Copyright 2010-2020 Greg Neagle.
diff --git a/code/client/launchapp b/code/client/launchapp
index d9632588..eb93118c 100755
--- a/code/client/launchapp
+++ b/code/client/launchapp
@@ -1,4 +1,4 @@
-#!/usr/local/munki/munki-python
+#!/usr/local/munki/python
 # encoding: utf-8
 #
 # Copyright 2010-2020 Greg Neagle.
diff --git a/code/client/logouthelper b/code/client/logouthelper
index 92fbdb02..d879d51b 100755
--- a/code/client/logouthelper
+++ b/code/client/logouthelper
@@ -1,4 +1,4 @@
-#!/usr/local/munki/munki-python
+#!/usr/local/munki/python
 # encoding: utf-8
 #
 # Copyright 2011-2020 Greg Neagle.
diff --git a/code/client/makepkginfo b/code/client/makepkginfo
index 22abc382..6eca440b 100755
--- a/code/client/makepkginfo
+++ b/code/client/makepkginfo
@@ -1,4 +1,4 @@
-#!/usr/local/munki/munki-python
+#!/usr/local/munki/python
 # encoding: utf-8
 #
 # Copyright 2008-2020 Greg Neagle.
diff --git a/code/client/managedsoftwareupdate b/code/client/managedsoftwareupdate
index 9f4a5a15..d4dc0738 100755
--- a/code/client/managedsoftwareupdate
+++ b/code/client/managedsoftwareupdate
@@ -1,4 +1,4 @@
-#!/usr/local/munki/munki-python
+#!/usr/local/munki/python
 # encoding: utf-8
 #
 # Copyright 2009-2020 Greg Neagle.
diff --git a/code/client/manifestutil b/code/client/manifestutil
index bed700e8..804c8d6c 100755
--- a/code/client/manifestutil
+++ b/code/client/manifestutil
@@ -1,4 +1,4 @@
-#!/usr/local/munki/munki-python
+#!/usr/local/munki/python
 # encoding: utf-8
 #
 # Copyright 2011-2020 Greg Neagle.
diff --git a/code/client/munkiimport b/code/client/munkiimport
index 98af9751..39769a8b 100755
--- a/code/client/munkiimport
+++ b/code/client/munkiimport
@@ -1,4 +1,4 @@
-#!/usr/local/munki/munki-python
+#!/usr/local/munki/python
 # encoding: utf-8
 #
 # Copyright 2010-2020 Greg Neagle.
diff --git a/code/client/precache_agent b/code/client/precache_agent
index 465cadc1..5c2f8441 100755
--- a/code/client/precache_agent
+++ b/code/client/precache_agent
@@ -1,4 +1,4 @@
-#!/usr/local/munki/munki-python
+#!/usr/local/munki/python
 # encoding: utf-8
 #
 # Copyright 2018-2020 Greg Neagle.
diff --git a/code/client/ptyexec b/code/client/ptyexec
index 5b9010b2..5fe5f9d5 100755
--- a/code/client/ptyexec
+++ b/code/client/ptyexec
@@ -1,4 +1,4 @@
-#!/usr/local/munki/munki-python
+#!/usr/local/munki/python
 # encoding: utf-8
 #
 # Copyright 2011-2017 Google Inc. All Rights Reserved.
diff --git a/code/client/removepackages b/code/client/removepackages
index 025a85f0..86168be5 100755
--- a/code/client/removepackages
+++ b/code/client/removepackages
@@ -1,4 +1,4 @@
-#!/usr/local/munki/munki-python
+#!/usr/local/munki/python
 # encoding: utf-8
 #
 # Copyright 2009-2020 Greg Neagle.
diff --git a/code/client/supervisor b/code/client/supervisor
index c34f5524..d52f6feb 100755
--- a/code/client/supervisor
+++ b/code/client/supervisor
@@ -1,4 +1,4 @@
-#!/usr/local/munki/munki-python
+#!/usr/local/munki/python
 # encoding: utf-8
 #
 # Copyright 2011-2013 Google Inc. All Rights Reserved.
diff --git a/code/tools/make_munki_mpkg.sh b/code/tools/make_munki_mpkg.sh
index 5075de79..969d96ef 100755
--- a/code/tools/make_munki_mpkg.sh
+++ b/code/tools/make_munki_mpkg.sh
@@ -568,7 +568,7 @@ chmod -R 755 "$PYTHONROOT/usr"
 # Copy framework
 cp -R "$MUNKIROOT/Python.framework" "$PYTHONROOT/usr/local/munki/"
 # Create symlink
-ln -s Python.framework/Versions/Current/bin/python3 "$PYTHONROOT/usr/local/munki/munki-python"
+ln -s Python.framework/Versions/Current/bin/python3 "$PYTHONROOT/usr/local/munki/python"
 # Set permissions.
 chmod -R go-w "$PYTHONROOT/usr/local/munki"
 chmod +x "$PYTHONROOT/usr/local/munki"
@@ -587,7 +587,7 @@ mkdir -m 1775 "$NOPYTHONROOT"
 mkdir -p "$NOPYTHONROOT/usr/local/munki"
 chmod -R 755 "$NOPYTHONROOT/usr"
 # Create symlink
-ln -s /usr/bin/python "$NOPYTHONROOT/usr/local/munki/munki-python"
+ln -s /usr/bin/python "$NOPYTHONROOT/usr/local/munki/python"
 # Set permissions.
 chmod -R go-w "$NOPYTHONROOT/usr/local/munki"
 chmod +x "$NOPYTHONROOT/usr/local/munki"
diff --git a/code/tools/pkgresources/Scripts_python/postinstall b/code/tools/pkgresources/Scripts_python/postinstall
index 82416c11..ae5d7927 100755
--- a/code/tools/pkgresources/Scripts_python/postinstall
+++ b/code/tools/pkgresources/Scripts_python/postinstall
@@ -3,5 +3,4 @@
 # removes old versions when installing/upgrading the Python framework.
 # will need to be updated if/when we move to Python 3.9
 
-/bin/rm -rf "$3/usr/local/munki/Python.framework/Versions/3.7"
-/bin/rm -f "$3/usr/local/munki/python"
\ No newline at end of file
+/bin/rm -rf "$3/usr/local/munki/Python.framework/Versions/3.7"
\ No newline at end of file