diff --git a/doc/vimwiki.txt b/doc/vimwiki.txt
index a03f50f..5f3f990 100644
--- a/doc/vimwiki.txt
+++ b/doc/vimwiki.txt
@@ -210,8 +210,8 @@ every case.
 Also note that some keys work in normal mode as well as in visual mode. If you
 remap them using :map, they will also run in operator-pending mode. If you
 don't want that, use >
-    :nmap <Leader>tt <Plug>VimwikiToggleCheckbox
-    :vmap <Leader>tt <Plug>VimwikiToggleCheckbox
+    :nmap <Leader>tt <Plug>VimwikiToggleListItem
+    :vmap <Leader>tt <Plug>VimwikiToggleListItem
 
 
 NORMAL MODE                                           *vimwiki-local-mappings*
@@ -321,10 +321,10 @@ NORMAL MODE                                           *vimwiki-local-mappings*
 <
                         *vimwiki_<C-Space>*
 <C-Space>               Toggle checkbox of a list item on/off
-                        Maps to |:VimwikiToggleCheckbox|.
+                        Maps to |:VimwikiToggleListItem|.
                         See |vimwiki-todo-lists|.
                         To remap: >
-                        :map <Leader>tt <Plug>VimwikiToggleCheckbox
+                        :map <Leader>tt <Plug>VimwikiToggleListItem
 <
                         *vimwiki_gl<Space>* *vimwiki_gL<Space>*
 gl<Space>               Remove checkbox from list item.
@@ -620,7 +620,7 @@ il                      A single list item.
     Convert all wiki pages to HTML.
     Default css file (style.css) is created if there is no one.
 
-*:VimwikiToggleCheckbox*
+*:VimwikiToggleListItem*
     Toggle checkbox of a list item on/off
     See |vimwiki-todo-lists|.
 
diff --git a/ftplugin/vimwiki.vim b/ftplugin/vimwiki.vim
index be7b1b2..089238b 100644
--- a/ftplugin/vimwiki.vim
+++ b/ftplugin/vimwiki.vim
@@ -188,7 +188,7 @@ command! -buffer -nargs=+ VimwikiReturn call <SID>CR(<f-args>)
 command! -buffer -range -nargs=1 VimwikiChangeSymbolTo call vimwiki#lst#change_marker(<line1>, <line2>, <f-args>, 'n')
 command! -buffer -range -nargs=1 VimwikiListChangeSymbolI call vimwiki#lst#change_marker(<line1>, <line2>, <f-args>, 'i')
 command! -buffer -nargs=1 VimwikiChangeSymbolInListTo call vimwiki#lst#change_marker_in_list(<f-args>)
-command! -buffer -range VimwikiToggleCheckbox call vimwiki#lst#toggle_cb(<line1>, <line2>)
+command! -buffer -range VimwikiToggleListItem call vimwiki#lst#toggle_cb(<line1>, <line2>)
 command! -buffer -range -nargs=+ VimwikiListChangeLvl call vimwiki#lst#change_level(<line1>, <line2>, <f-args>)
 command! -buffer -range VimwikiRemoveSingleCB call vimwiki#lst#remove_cb(<line1>, <line2>)
 command! -buffer VimwikiRemoveCBInList call vimwiki#lst#remove_cb_in_list()
@@ -318,18 +318,18 @@ nnoremap <silent><script><buffer>
       \ <Plug>VimwikiDiaryPrevDay :VimwikiDiaryPrevDay<CR>
 
 " List mappings
-if !hasmapto('<Plug>VimwikiToggleCheckbox')
-  nmap <silent><buffer> <C-Space> <Plug>VimwikiToggleCheckbox
-  vmap <silent><buffer> <C-Space> <Plug>VimwikiToggleCheckbox
+if !hasmapto('<Plug>VimwikiToggleListItem')
+  nmap <silent><buffer> <C-Space> <Plug>VimwikiToggleListItem
+  vmap <silent><buffer> <C-Space> <Plug>VimwikiToggleListItem
   if has("unix")
-    nmap <silent><buffer> <C-@> <Plug>VimwikiToggleCheckbox
-    vmap <silent><buffer> <C-@> <Plug>VimwikiToggleCheckbox
+    nmap <silent><buffer> <C-@> <Plug>VimwikiToggleListItem
+    vmap <silent><buffer> <C-@> <Plug>VimwikiToggleListItem
   endif
 endif
 nnoremap <silent><script><buffer>
-      \ <Plug>VimwikiToggleCheckbox :VimwikiToggleCheckbox<CR>
+      \ <Plug>VimwikiToggleListItem :VimwikiToggleListItem<CR>
 vnoremap <silent><script><buffer>
-      \ <Plug>VimwikiToggleCheckbox :VimwikiToggleCheckbox<CR>
+      \ <Plug>VimwikiToggleListItem :VimwikiToggleListItem<CR>
 
 if !hasmapto('<Plug>VimwikiDecreaseLvlSingleItem', 'i')
   imap <silent><buffer> <C-D>