diff --git a/bin/dot b/bin/dot
index 4d3455621c0..09e1aa7d944 100755
--- a/bin/dot
+++ b/bin/dot
@@ -4,18 +4,18 @@
 #
 # `dot` handles installation, updates, things like that. Run it periodically
 # to make sure you're on the latest and greatest.
-export ZSH=$HOME/.dotfiles
+export DOTFILES=$HOME/.dotfiles
 
 # Set macOS defaults
-$ZSH/macos/set-defaults.sh
+$DOTFILES/macos/set-defaults.sh
 
 # Install homebrew
-$ZSH/homebrew/install.sh 2>&1
+$DOTFILES/homebrew/install.sh 2>&1
 
 # Upgrade homebrew
 echo "› brew update"
 brew update
 
 # Install software
-echo "› $ZSH/script/install"
-$ZSH/script/install
+echo "› $DOTFILES/script/install"
+$DOTFILES/script/install
diff --git a/bin/set-defaults b/bin/set-defaults
index 333859619a8..b566e3fd4b3 100755
--- a/bin/set-defaults
+++ b/bin/set-defaults
@@ -1,5 +1,5 @@
 #!/bin/sh
 #
-# Sets macOS defaults by running $ZSH/macos/set-defaults.sh.
+# Sets macOS defaults by running $DOTFILES/macos/set-defaults.sh.
 
-exec $ZSH/macos/set-defaults.sh
+exec $DOTFILES/macos/set-defaults.sh
diff --git a/git/gitconfig.symlink b/git/gitconfig.symlink
index c936c2b2cf2..05086ef786d 100644
--- a/git/gitconfig.symlink
+++ b/git/gitconfig.symlink
@@ -5,9 +5,9 @@
         protocol = https
 [alias]
         co = checkout
-        promote = !$ZSH/bin/git-promote
-        wtf     = !$ZSH/bin/git-wtf
-        rank-contributors = !$ZSH/bin/git-rank-contributors
+        promote = !$DOTFILES/bin/git-promote
+        wtf     = !$DOTFILES/bin/git-wtf
+        rank-contributors = !$DOTFILES/bin/git-rank-contributors
         count   = !git shortlog -sn
 [color]
         diff = auto
diff --git a/system/_path.zsh b/system/_path.zsh
index 255c2cfca66..ce76bd3d38e 100644
--- a/system/_path.zsh
+++ b/system/_path.zsh
@@ -1,2 +1,2 @@
-export PATH="./bin:/usr/local/bin:/usr/local/sbin:$ZSH/bin:$PATH"
+export PATH="./bin:/usr/local/bin:/usr/local/sbin:$DOTFILES/bin:$PATH"
 export MANPATH="/usr/local/man:/usr/local/mysql/man:/usr/local/git/man:$MANPATH"
diff --git a/zsh/config.zsh b/zsh/config.zsh
index bdf8f9826d0..a7a7b17117a 100644
--- a/zsh/config.zsh
+++ b/zsh/config.zsh
@@ -7,9 +7,9 @@ fi
 export LSCOLORS="exfxcxdxbxegedabagacad"
 export CLICOLOR=true
 
-fpath=($ZSH/functions $fpath)
+fpath=($DOTFILES/functions $fpath)
 
-autoload -U $ZSH/functions/*(:t)
+autoload -U $DOTFILES/functions/*(:t)
 
 HISTFILE=~/.zsh_history
 HISTSIZE=10000
diff --git a/zsh/fpath.zsh b/zsh/fpath.zsh
index eaff4f41b0b..5254cdbdbac 100644
--- a/zsh/fpath.zsh
+++ b/zsh/fpath.zsh
@@ -1,2 +1,2 @@
 #add each topic folder to fpath so that they can add functions and completion scripts
-for topic_folder ($ZSH/*) if [ -d $topic_folder ]; then  fpath=($topic_folder $fpath); fi;
+for topic_folder ($DOTFILES/*) if [ -d $topic_folder ]; then  fpath=($topic_folder $fpath); fi;
diff --git a/zsh/zshrc.symlink b/zsh/zshrc.symlink
index d398ac84809..14c891ad390 100644
--- a/zsh/zshrc.symlink
+++ b/zsh/zshrc.symlink
@@ -1,5 +1,5 @@
-# shortcut to this dotfiles path is $ZSH
-export ZSH=$HOME/.dotfiles
+# shortcut to this dotfiles path is $DOTFILES
+export DOTFILES=$HOME/.dotfiles
 
 # your project folder that we can `c [tab]` to
 export PROJECTS=~/Code
@@ -14,7 +14,7 @@ fi
 
 # all of our zsh files
 typeset -U config_files
-config_files=($ZSH/**/*.zsh)
+config_files=($DOTFILES/**/*.zsh)
 
 # load the path files
 for file in ${(M)config_files:#*/path.zsh}