diff --git a/bin/pyenv-sh-activate b/bin/pyenv-sh-activate
index 4535941..7e58d66 100755
--- a/bin/pyenv-sh-activate
+++ b/bin/pyenv-sh-activate
@@ -20,9 +20,10 @@ if [ "$1" = "--complete" ]; then
   exec pyenv-virtualenvs --bare
 fi
 
-unset QUIET
-if [ "$1" = "--quiet" ]; then
-  QUIET=1
+unset NOERROR
+
+if [ "$1" = "--no-error" ]; then
+  NOERROR=1
   shift 1
 fi
 
@@ -46,13 +47,13 @@ if [ -z "${PYENV_VIRTUALENV_INIT}" ]; then
 fi
 
 if [ "${#versions[@]}" -gt 1 ]; then
-  [ -n "$QUIET" ] || echo "pyenv-virtualenv: cannot activate multiple versions at once: ${versions[@]}" 1>&2
+  [ -n "$NOERROR" ] || echo "pyenv-virtualenv: cannot activate multiple versions at once: ${versions[@]}" 1>&2
   echo "false"
   exit 1
 fi
 
 if ! pyenv-virtualenv-prefix "${versions}" 1>/dev/null 2>&1; then
-  [ -n "$QUIET" ] || echo "pyenv-virtualenv: version \`${versions}' is not a virtualenv" 1>&2
+  [ -n "$NOERROR" ] || echo "pyenv-virtualenv: version \`${versions}' is not a virtualenv" 1>&2
   echo "false"
   exit 1
 fi
@@ -77,7 +78,7 @@ fish )
 esac
 
 # Display setup instruction if 'pyenv virtualenv-init -' is not found in "$profile"
-if [ -z "$QUIET" ]; then
+if [ -z "$NOERROR" ]; then
   if [ -f "$profile" ] && grep -q 'pyenv init -' "$profile" && ! grep -q 'pyenv virtualenv-init -' "$profile"; then
     pyenv-virtualenv-init >&2 || true
   fi
diff --git a/bin/pyenv-sh-deactivate b/bin/pyenv-sh-deactivate
index cde4b08..20998c8 100755
--- a/bin/pyenv-sh-deactivate
+++ b/bin/pyenv-sh-deactivate
@@ -9,9 +9,10 @@
 set -e
 [ -n "$PYENV_DEBUG" ] && set -x
 
-unset QUIET
-if [ "$1" = "--quiet" ]; then
-  QUIET=1
+unset NOERROR
+
+if [ "$1" = "--no-error" ]; then
+  NOERROR=1
   shift 1
 fi
 
@@ -48,7 +49,7 @@ EOS
   ;;
 esac
 
-if [ -z "$QUIET" ]; then
+if [ -z "$NOERROR" ]; then
   echo "  echo \"pyenv-virtualenv: no virtualenv has been activated.\" 1>&2;"
 fi
 
diff --git a/test/activate.bats b/test/activate.bats
index 03e3a64..4a5b419 100644
--- a/test/activate.bats
+++ b/test/activate.bats
@@ -150,10 +150,10 @@ false
 EOS
 }
 
-@test "should fail if the version is not a virtualenv (quiet)" {
+@test "should fail if the version is not a virtualenv (no-error)" {
   stub pyenv-virtualenv-prefix "3.3.3 : false"
 
-  run pyenv-sh-activate --quiet "3.3.3"
+  run pyenv-sh-activate --no-error "3.3.3"
 
   unstub pyenv-virtualenv-prefix
 
@@ -173,8 +173,8 @@ false
 EOS
 }
 
-@test "should fail if there are multiple versions (quiet)" {
-  run pyenv-sh-activate --quiet "venv" "venv27"
+@test "should fail if there are multiple versions (no-error)" {
+  run pyenv-sh-activate --no-error "venv" "venv27"
 
   assert_failure
   assert_output <<EOS
diff --git a/test/deactivate.bats b/test/deactivate.bats
index 6886005..62cafaf 100644
--- a/test/deactivate.bats
+++ b/test/deactivate.bats
@@ -23,10 +23,10 @@ fi;
 EOS
 }
 
-@test "deactivate virtualenv (quiet)" {
+@test "deactivate virtualenv (no-error)" {
   export PYENV_VIRTUALENV_INIT=1
 
-  PYENV_SHELL="bash" run pyenv-sh-deactivate --quiet
+  PYENV_SHELL="bash" run pyenv-sh-deactivate --no-error
 
   assert_success
   assert_output <<EOS
@@ -57,10 +57,10 @@ fi;
 EOS
 }
 
-@test "deactivate virtualenv (w/o pyenv-virtualenv-init) (quiet)" {
+@test "deactivate virtualenv (w/o pyenv-virtualenv-init) (no-error)" {
   export PYENV_VIRTUALENV_INIT=
 
-  PYENV_SHELL="bash" run pyenv-sh-deactivate --quiet
+  PYENV_SHELL="bash" run pyenv-sh-deactivate --no-error
 
   assert_success
   assert_output <<EOS
@@ -91,10 +91,10 @@ end;
 EOS
 }
 
-@test "deactivate virtualenv (fish) (quiet)" {
+@test "deactivate virtualenv (fish) (no-error)" {
   export PYENV_VIRTUALENV_INIT=1
 
-  PYENV_SHELL="fish" run pyenv-sh-deactivate --quiet
+  PYENV_SHELL="fish" run pyenv-sh-deactivate --no-error
 
   assert_success
   assert_output <<EOS
@@ -125,10 +125,10 @@ end;
 EOS
 }
 
-@test "deactivate virtualenv (fish) (w/o pyenv-virtualenv-init) (quiet)" {
+@test "deactivate virtualenv (fish) (w/o pyenv-virtualenv-init) (no-error)" {
   export PYENV_VIRTUALENV_INIT=
 
-  PYENV_SHELL="fish" run pyenv-sh-deactivate --quiet
+  PYENV_SHELL="fish" run pyenv-sh-deactivate --no-error
 
   assert_success
   assert_output <<EOS