diff --git a/plugins/screen/init.zsh b/plugins/screen/init.zsh
index 7a88ac9..edeeb61 100644
--- a/plugins/screen/init.zsh
+++ b/plugins/screen/init.zsh
@@ -8,7 +8,7 @@
 #   To auto start it, add the following to zshrc:
 #
 #     # Auto launch GNU Screen at start-up.
-#     zstyle -t ':omz:plugin:screen:auto' start 'yes'
+#     zstyle -t ':omz:plugin:screen' auto-start 'yes'
 #
 
 # Aliases
@@ -17,7 +17,7 @@ alias sn="screen -U -S"
 alias sr="screen -a -A -U -D -R"
 
 # Auto Start
-if [[ -z "$STY" ]] && zstyle -t ':omz:plugin:screen:auto' start; then
+if [[ -z "$STY" ]] && zstyle -t ':omz:plugin:screen' auto-start; then
   session="$(
     screen -list 2> /dev/null \
       | sed '1d;$d' \
diff --git a/plugins/tmux/init.zsh b/plugins/tmux/init.zsh
index cbf6d2b..593868c 100644
--- a/plugins/tmux/init.zsh
+++ b/plugins/tmux/init.zsh
@@ -9,7 +9,7 @@
 #   To auto start it, add the following to zshrc:
 #
 #     # Auto launch tmux at start-up.
-#     zstyle -t ':omz:plugin:tmux:auto' start 'yes'
+#     zstyle -t ':omz:plugin:tmux' auto-start 'yes'
 #
 # Warning:
 #   Tmux is known to cause kernel panics on Mac OS X.
@@ -21,7 +21,7 @@ alias ta="tmux attach-session"
 alias tl="tmux list-sessions"
 
 # Auto Start
-if [[ -z "$TMUX" ]] && zstyle -t ':omz:plugin:tmux:auto' start; then
+if [[ -z "$TMUX" ]] && zstyle -t ':omz:plugin:tmux' auto-start; then
   tmux_session='#OMZ'
 
   if ! tmux has-session -t "$tmux_session" 2> /dev/null; then
diff --git a/templates/zshrc b/templates/zshrc
index 925cbe4..deced37 100644
--- a/templates/zshrc
+++ b/templates/zshrc
@@ -18,7 +18,7 @@ zstyle ':omz:*:*' case-sensitive 'no'
 zstyle ':omz:*:*' color 'yes'
 
 # Auto set the tab and window titles.
-zstyle ':omz:terminal:auto' title 'yes'
+zstyle ':omz:terminal' auto-title 'yes'
 
 # Set the plugins to load (see $OMZ/plugins/).
 zstyle ':omz:load' plugin 'archive' 'git'
diff --git a/terminal.zsh b/terminal.zsh
index 72e3209..7679d83 100644
--- a/terminal.zsh
+++ b/terminal.zsh
@@ -78,7 +78,7 @@ autoload -Uz add-zsh-hook
 
 # Sets the tab and window titles before the prompt is displayed.
 function set-title-precmd {
-  if [[ "$TERM_PROGRAM" != "Apple_Terminal" ]] && zstyle -t ':omz:terminal:auto' title; then
+  if [[ "$TERM_PROGRAM" != "Apple_Terminal" ]] && zstyle -t ':omz:terminal' auto-title; then
     set-window-title "${(%):-%~}"
     for kind in tab screen; do
       # Left-truncate the current working directory to 15 characters.
@@ -93,7 +93,7 @@ add-zsh-hook precmd set-title-precmd
 
 # Sets the tab and window titles before command execution.
 function set-title-preexec {
-  if zstyle -t ':omz:terminal:auto' title; then
+  if zstyle -t ':omz:terminal' auto-title; then
     set-title-by-command "$2"
   fi
 }