diff --git a/libexec/pyenv b/libexec/pyenv
index 93d8866f..5c4d71a5 100755
--- a/libexec/pyenv
+++ b/libexec/pyenv
@@ -29,7 +29,7 @@ if enable -f "${BASH_SOURCE%/*}"/../libexec/pyenv-realpath.dylib realpath 2>/dev
 else
   [ -z "$PYENV_NATIVE_EXT" ] || abort "failed to load \`realpath' builtin"
 
-  READLINK=$(type -p greadlink readlink | head -1)
+  READLINK=$(type -P greadlink readlink | head -1)
   [ -n "$READLINK" ] || abort "cannot find readlink - are you missing GNU coreutils?"
 
   resolve_link() {
diff --git a/libexec/pyenv-help b/libexec/pyenv-help
index c7ff6124..91962576 100755
--- a/libexec/pyenv-help
+++ b/libexec/pyenv-help
@@ -45,7 +45,7 @@ extract_initial_comment_block() {
 
 collect_documentation() {
   # shellcheck disable=SC2016
-  $(type -p gawk awk | head -1) '
+  $(type -P gawk awk | head -1) '
     /^Summary:/ {
       summary = substr($0, 10)
       next
diff --git a/libexec/pyenv-hooks b/libexec/pyenv-hooks
index 2c1620f3..1b8c528d 100755
--- a/libexec/pyenv-hooks
+++ b/libexec/pyenv-hooks
@@ -26,7 +26,7 @@ if ! enable -f "${BASH_SOURCE%/*}"/pyenv-realpath.dylib realpath 2>/dev/null; th
     echo "pyenv: failed to load \`realpath' builtin" >&2
     exit 1
   fi
-READLINK=$(type -p greadlink readlink | head -1)
+READLINK=$(type -P greadlink readlink | head -1)
 if [ -z "$READLINK" ]; then
   echo "pyenv: cannot find readlink - are you missing GNU coreutils?" >&2
   exit 1
diff --git a/libexec/pyenv-versions b/libexec/pyenv-versions
index c317dc11..273eb20a 100755
--- a/libexec/pyenv-versions
+++ b/libexec/pyenv-versions
@@ -33,7 +33,7 @@ if ! enable -f "${BASH_SOURCE%/*}"/pyenv-realpath.dylib realpath 2>/dev/null; th
     exit 1
   fi
 
-  READLINK=$(type -p greadlink readlink | head -1)
+  READLINK=$(type -P greadlink readlink | head -1)
   if [ -z "$READLINK" ]; then
     echo "pyenv: cannot find readlink - are you missing GNU coreutils?" >&2
     exit 1
diff --git a/plugins/python-build/bin/pyenv-install b/plugins/python-build/bin/pyenv-install
index ce6966ef..07d5555f 100755
--- a/plugins/python-build/bin/pyenv-install
+++ b/plugins/python-build/bin/pyenv-install
@@ -59,7 +59,7 @@ usage() {
 
 definitions() {
   local query="$1"
-  python-build --definitions | $(type -ap ggrep grep | head -1) -F "$query" || true
+  python-build --definitions | $(type -P ggrep grep | head -1) -F "$query" || true
 }
 
 indent() {
diff --git a/plugins/python-build/bin/python-build b/plugins/python-build/bin/python-build
index cc7f51d6..f1ae369b 100755
--- a/plugins/python-build/bin/python-build
+++ b/plugins/python-build/bin/python-build
@@ -58,7 +58,7 @@ lib "$1"
 
 
 resolve_link() {
-  $(type -p greadlink readlink | head -1) "$1"
+  $(type -P greadlink readlink | head -1) "$1"
 }
 
 abs_dirname() {
@@ -1494,7 +1494,7 @@ build_package_verify_openssl() {
       RbConfig::CONFIG.fetch("configure_args").shellsplit.each { |arg| $stderr.puts "  #{arg}" }
       exit 1
     end
-  ' "$(basename "$(type -p yum apt-get | head -1)")" >&4 2>&1
+  ' "$(basename "$(type -P yum apt-get | head -1)")" >&4 2>&1
 }
 
 use_homebrew_zlib() {
diff --git a/plugins/python-build/test/pyenv_ext.bats b/plugins/python-build/test/pyenv_ext.bats
index e5149003..55c44bc8 100644
--- a/plugins/python-build/test/pyenv_ext.bats
+++ b/plugins/python-build/test/pyenv_ext.bats
@@ -89,7 +89,7 @@ install_tmp_fixture() {
 }
 
 resolve_link() {
-  $(type -p greadlink readlink | head -1) "$1"
+  $(type -P greadlink readlink | head -1) "$1"
 }
 
 run_inline_definition_with_name() {
diff --git a/plugins/python-build/test/test_helper.bash b/plugins/python-build/test/test_helper.bash
index a9c775df..c7494f64 100644
--- a/plugins/python-build/test/test_helper.bash
+++ b/plugins/python-build/test/test_helper.bash
@@ -130,7 +130,7 @@ assert_output_contains() {
     echo "assert_output_contains needs an argument" >&2
     return 1
   fi
-  echo "$output" | $(type -p ggrep grep | head -1) -F "$expected" >/dev/null || {
+  echo "$output" | $(type -P ggrep grep | head -1) -F "$expected" >/dev/null || {
     { echo "expected output to contain $expected"
       echo "actual: $output"
     } | flunk