diff --git a/plugin/commentary.vim b/plugin/commentary.vim
index 079bce1..8671f6a 100644
--- a/plugin/commentary.vim
+++ b/plugin/commentary.vim
@@ -103,20 +103,20 @@ function! s:textobject(inner) abort
 endfunction
 
 command! -range -bar -bang Commentary call s:go(<line1>,<line2>,<bang>0)
-xnoremap <expr>   <Plug>Commentary     <SID>go()
-nnoremap <expr>   <Plug>Commentary     <SID>go()
-nnoremap <expr>   <Plug>CommentaryLine <SID>go() . '_'
-onoremap <silent> <Plug>Commentary        :<C-U>call <SID>textobject(get(v:, 'operator', '') ==# 'c')<CR>
-nnoremap <silent> <Plug>ChangeCommentary c:<C-U>call <SID>textobject(1)<CR>
+xnoremap <expr>   <Plug>(Commentary)     <SID>go()
+nnoremap <expr>   <Plug>(Commentary)     <SID>go()
+nnoremap <expr>   <Plug>(CommentaryLine) <SID>go() . '_'
+onoremap <silent> <Plug>(Commentary)        :<C-U>call <SID>textobject(get(v:, 'operator', '') ==# 'c')<CR>
+nnoremap <silent> <Plug>(ChangeCommentary) c:<C-U>call <SID>textobject(1)<CR>
 
-if !hasmapto('<Plug>Commentary') || maparg('gc','n') ==# ''
-  xmap gc  <Plug>Commentary
-  nmap gc  <Plug>Commentary
-  omap gc  <Plug>Commentary
-  nmap gcc <Plug>CommentaryLine
-  nmap gcu <Plug>Commentary<Plug>Commentary
+if !hasmapto('<Plug>(Commentary)') || maparg('gc','n') ==# ''
+  xmap gc  <Plug>(Commentary)
+  nmap gc  <Plug>(Commentary)
+  omap gc  <Plug>(Commentary)
+  nmap gcc <Plug>(CommentaryLine)
+  nmap gcu <Plug>(Commentary)<Plug>(Commentary)
 endif
 
-nmap <silent> <Plug>CommentaryUndo :echoerr "Change your <Plug>CommentaryUndo map to <Plug>Commentary<Plug>Commentary"<CR>
+nmap <silent> <Plug>(CommentaryUndo) :echoerr "Change your <Plug>(CommentaryUndo) map to <Plug>(Commentary)<Plug>(Commentary)"<CR>
 
 " vim:set et sw=2: