autoenv.zsh             |  8 ++++----
 tests/cwd.t             | 18 +++++++++---------
 tests/recurse-upwards.t |  8 ++++----

diff --git a/autoenv.zsh b/autoenv.zsh
index 1211f9c2ba43a181b503e4be4fbd930e61208c9b..23866f31824a6383af7d8c5814bbbaad00075958 100644
--- a/autoenv.zsh
+++ b/autoenv.zsh
@@ -195,11 +195,11 @@ _autoenv_source_dir=${0:A:h}
 
 _autoenv_source() {
   local env_file=$1
-  _autoenv_event=$2
+  autoenv_event=$2
   local _autoenv_envfile_dir=${3:-${1:A:h}}
 
-  _autoenv_from_dir=$_autoenv_chpwd_prev_dir
-  _autoenv_to_dir=$PWD
+  autoenv_from_dir=$_autoenv_chpwd_prev_dir
+  autoenv_to_dir=$PWD
 
   # Source varstash library once.
   if [[ -z "$functions[(I)autostash]" ]]; then
@@ -221,7 +221,7 @@
   # Unset vars set for enter/leave scripts.
   # This should not get done for recursion (via autoenv_source_parent),
   # and can be useful to have in general after autoenv was used.
-  # unset _autoenv_event _autoenv_from_dir _autoenv_to_dir
+  # unset autoenv_event autoenv_from_dir autoenv_to_dir
 }
 
 _autoenv_get_file_upwards() {
diff --git a/tests/cwd.t b/tests/cwd.t
index 32687c219e4c708b0022e7394475b3237fd2333f..60a2d500d21216021f808faca1b5f83d46ac235b 100644
--- a/tests/cwd.t
+++ b/tests/cwd.t
@@ -1,4 +1,4 @@
-Test $PWD, $_autoenv_from_dir and _autoenv_to_dir.
+Test $PWD, $autoenv_event, $autoenv_from_dir and $autoenv_to_dir.
 
   $ source $TESTDIR/setup.sh
 
@@ -7,8 +7,8 @@
   $ AUTOENV_LOOK_UPWARDS=1
   $ mkdir -p sub/sub2
   $ cd sub
-  $ echo 'echo ENTERED: PWD:${PWD:t} from:${_autoenv_from_dir:t} to:${_autoenv_to_dir:t}' > .env
-  $ echo 'echo LEFT: PWD:${PWD:t} from:${_autoenv_from_dir:t} to:${_autoenv_to_dir:t}' > .env.leave
+  $ echo 'echo ENTERED: PWD:${PWD:t} from:${autoenv_from_dir:t} to:${autoenv_to_dir:t} event:${autoenv_event}' > .env
+  $ echo 'echo LEFT: PWD:${PWD:t} from:${autoenv_from_dir:t} to:${autoenv_to_dir:t} event:${autoenv_event}' > .env.leave
 
 Manually create auth files.
 
@@ -17,21 +17,21 @@
 The actual tests.
 
   $ cd .
-  ENTERED: PWD:sub from:sub to:sub
+  ENTERED: PWD:sub from:sub to:sub event:enter
 
   $ cd ..
-  LEFT: PWD:sub from:sub to:cwd.t
+  LEFT: PWD:sub from:sub to:cwd.t event:leave
 
   $ cd sub/sub2
-  ENTERED: PWD:sub from:cwd.t to:sub2
+  ENTERED: PWD:sub from:cwd.t to:sub2 event:enter
 
 Check that symlinked dirs get handled correctly.
 
   $ cd ../..
-  LEFT: PWD:sub from:sub2 to:cwd.t
+  LEFT: PWD:sub from:sub2 to:cwd.t event:leave
   $ ln -s sub sub_linked
   $ cd sub_linked
-  ENTERED: PWD:sub from:cwd.t to:sub_linked
+  ENTERED: PWD:sub from:cwd.t to:sub_linked event:enter
   $ cd sub2
-  ENTERED: PWD:sub from:sub_linked to:sub2
+  ENTERED: PWD:sub from:sub_linked to:sub2 event:enter
   $ cd .
diff --git a/tests/recurse-upwards.t b/tests/recurse-upwards.t
index f4c2780c75368fc1c77c11d52518d53dda2e64f1..aa36edd22d43db5807ccf25eb04fa2aa35e97207 100644
--- a/tests/recurse-upwards.t
+++ b/tests/recurse-upwards.t
@@ -8,8 +8,8 @@   $ AUTOENV_LOOK_UPWARDS=1
 
 Create env files in root dir.
 
-  $ echo 'echo ENTERED_root: PWD:${PWD:t} from:${_autoenv_from_dir:t} to:${_autoenv_to_dir:t}' > .env
-  $ echo 'echo LEFT_root: PWD:${PWD:t} from:${_autoenv_from_dir:t} to:${_autoenv_to_dir:t}' > .env.leave
+  $ echo 'echo ENTERED_root: PWD:${PWD:t} from:${autoenv_from_dir:t} to:${autoenv_to_dir:t}' > .env
+  $ echo 'echo LEFT_root: PWD:${PWD:t} from:${autoenv_from_dir:t} to:${autoenv_to_dir:t}' > .env.leave
   $ test_autoenv_auth_env_files
 
 Create env files in sub dir.
@@ -18,8 +18,8 @@   $ mkdir -p sub/sub2
   $ cd sub
   ENTERED_root: PWD:recurse-upwards.t from:recurse-upwards.t to:sub
 
-  $ echo 'echo ENTERED_sub: PWD:${PWD:t} from:${_autoenv_from_dir:t} to:${_autoenv_to_dir:t}' > .env
-  $ echo 'echo LEFT_sub: PWD:${PWD:t} from:${_autoenv_from_dir:t} to:${_autoenv_to_dir:t}' > .env.leave
+  $ echo 'echo ENTERED_sub: PWD:${PWD:t} from:${autoenv_from_dir:t} to:${autoenv_to_dir:t}' > .env
+  $ echo 'echo LEFT_sub: PWD:${PWD:t} from:${autoenv_from_dir:t} to:${autoenv_to_dir:t}' > .env.leave
   $ test_autoenv_auth_env_files
 
 The actual tests.