diff --git a/plugins/battery.md b/plugins/battery.md
index 74140a5..3cfb500 100644
--- a/plugins/battery.md
+++ b/plugins/battery.md
@@ -1,8 +1,8 @@
 # Battery
 
 + Plugin Name: `battery`
-+ Config Variables
-	+ `WISH_BATTERY_ID`: ID of Battery to check. Default: `BAT0`
-	+ `WISH_BATTERY_CHARGING`: Symbol while the battery is charging. Default: ϟ
-	+ `WISH_BATTERY_DISCHARGING`: Symbol while the battery is discharging. Default: ⏚
++ Config keys
+	+ `id`: ID of Battery to check. Default: `BAT0`
+	+ `charging`: Symbol while the battery is charging. Default: ϟ
+	+ `discharging`: Symbol while the battery is discharging. Default: ⏚
 
diff --git a/plugins/bgjobs.md b/plugins/bgjobs.md
index af8d535..c7d8e7e 100644
--- a/plugins/bgjobs.md
+++ b/plugins/bgjobs.md
@@ -1,5 +1,5 @@
 # Background Jobs
 
 + Plugin Name: `bg_jobs`
-+ Config Variables
++ Config keys
 	+ `WISH_BG_JOBS_SUFFIX`: Suffix to add to number of background jobs. Default: &
diff --git a/plugins/customtext.md b/plugins/customtext.md
index 6e58d25..a7d4206 100644
--- a/plugins/customtext.md
+++ b/plugins/customtext.md
@@ -1,5 +1,5 @@
 # Custom Text
 
 + Plugin Name: `custom_text`
-+ Config Variables
++ Config keys
 	+ `WISH_CUSTOM_TEXT`: Custom Text to display.
diff --git a/plugins/date.md b/plugins/date.md
index 7e29a54..29ffea7 100644
--- a/plugins/date.md
+++ b/plugins/date.md
@@ -1,5 +1,5 @@
 # Date
 
 + Plugin Name: `date`
-+ Config Variables
-	+ `WISH_DATE_FORMAT`: set the date format. Refer to `FORMAT` section of  `man date` for more details. Default: `%F %T`.
++ Config keys
+	+ `format`: set the date format. Refer to `FORMAT` section of  `man date` for more details. Default: `%F %T`.
diff --git a/plugins/exitcode.md b/plugins/exitcode.md
index 513a8e3..3eb3c08 100644
--- a/plugins/exitcode.md
+++ b/plugins/exitcode.md
@@ -1,5 +1,5 @@
 # Exit Code
 
 + Plugin Name: `exit_code`
-+ Config Variables
++ Config keys
 	+ None
diff --git a/plugins/exitcodesmiley.md b/plugins/exitcodesmiley.md
index 6cb4b93..5b26b01 100644
--- a/plugins/exitcodesmiley.md
+++ b/plugins/exitcodesmiley.md
@@ -1,7 +1,7 @@
 # Exit Code Smiley
 
 + Plugin Name: `exit_code_smiley`
-+ Config Variables
++ Config keys
 	+ `WISH_EXIT_CODE_SMILEY_PASS`: Text to show when the last command ran successfully. Default: `:)`
 	+ `WISH_EXIT_CODE_SMILEY_FAIL`: Text to show when the last command failed. Default: `:(`
 	+ `WISH_EXIT_CODE_SMILEY_HIDE_ON_PASS`: Whether to hide the output if command executes successfully. Default: 0
diff --git a/plugins/hostname.md b/plugins/hostname.md
index 40f1198..c2dadd6 100644
--- a/plugins/hostname.md
+++ b/plugins/hostname.md
@@ -1,5 +1,5 @@
 # Hostname
 
 + Plugin Name: `hostname`
-+ Config Variables
++ Config keys
 	+ None
diff --git a/plugins/newline.md b/plugins/newline.md
index 9d6af9d..dc309f6 100644
--- a/plugins/newline.md
+++ b/plugins/newline.md
@@ -1,4 +1,4 @@
 # Newline
 
 + Plugin Name: `newline`
-+ Config Variables
++ Config keys
diff --git a/plugins/path.md b/plugins/path.md
index b90dee8..97d4e44 100644
--- a/plugins/path.md
+++ b/plugins/path.md
@@ -1,5 +1,5 @@
 # Path
 
 + Plugin Name: `path`
-+ Config Variables
-	+ `WISH_PATH_NO_WRITE_SUFFIX`: Suffix if the current path is not writeable. Default: ``
++ Config keys
+	+ `no_write_suffix`: Suffix if the current path is not writeable. Default: ``
diff --git a/plugins/pythonvenv.md b/plugins/pythonvenv.md
index 2a87a44..34dbc7d 100644
--- a/plugins/pythonvenv.md
+++ b/plugins/pythonvenv.md
@@ -1,4 +1,4 @@
 # Python Virtualenv
 
 + Plugin Name: `python_venv`
-+ Config Variables
++ Config keys
diff --git a/plugins/space.md b/plugins/space.md
index 03b8f7c..f50f2bb 100644
--- a/plugins/space.md
+++ b/plugins/space.md
@@ -1,4 +1,4 @@
 # Space
 
 + Plugin Name: `space`
-+ Config Variables
++ Config keys
diff --git a/plugins/tmux.md b/plugins/tmux.md
index a6514ee..198711d 100644
--- a/plugins/tmux.md
+++ b/plugins/tmux.md
@@ -1,5 +1,5 @@
 # Tmux Detached Sessions
 
 + Plugin Name: `tmux`
-+ Config Variables
-	+ `WISH_TMUX_SUFFIX`: suffix to add after number of detached sessions. Default: `d`
++ Config keys
+	+ `suffix`: suffix to add after number of detached sessions. Default: `d`
diff --git a/plugins/username.md b/plugins/username.md
index 205b0b6..065d8d7 100644
--- a/plugins/username.md
+++ b/plugins/username.md
@@ -1,4 +1,4 @@
 # Username
 
 + Plugin Name: `username`
-+ Config Variables
++ Config keys
diff --git a/plugins/vcs.md b/plugins/vcs.md
index d2b5933..53e8bb6 100644
--- a/plugins/vcs.md
+++ b/plugins/vcs.md
@@ -1,7 +1,7 @@
 # Version Control System (Git)
 
 + Plugin Name: `vcs`
-+ Config Variables
-	+ `WISH_VCS_GIT_SYMBOL`: Symbol to indicate that the current directory is a git repo. Default: 
-	+ `WISH_VCS_DEFAULT`: Symbol to display when the current directory is not a git repo. Default: $
-	+ `WISH_VCS_GIT_UNTRACKED_SYMBOL`: Symbol to show if the current git repo has untracked files. Default: ●
++ Config keys
+	+ `git_symbol`: Symbol to indicate that the current directory is a git repo. Default: 
+	+ `default`: Symbol to display when the current directory is not a git repo. Default: $
+	+ `git_untracked_symbol`: Symbol to show if the current git repo has untracked files. Default: ●