3 files changed, 19 insertions, 19 deletions
diff --git a/bundle/todo/autoload/todo.vim b/bundle/todo-comments/autoload/todo_comments.vim
index 6885b2b..8f0d19a 100644
--- a/bundle/todo/autoload/todo.vim
+++ b/bundle/todo-comments/autoload/todo_comments.vim
@@ -10,10 +10,10 @@ function! s:MoveToTODO(search_flags)
 	endwhile
 endfunction
 
-function! todo#NextTODO()
+function! todo_comments#NextTODO()
 	call s:MoveToTODO('')
 endfunction
 
-function! todo#PreviousTODO()
+function! todo_comments#PreviousTODO()
 	call s:MoveToTODO('b')
 endfunction
diff --git a/bundle/todo-comments/plugin/todo_comments.vim b/bundle/todo-comments/plugin/todo_comments.vim
new file mode 100644
index 0000000..26d243b
--- /dev/null
+++ b/bundle/todo-comments/plugin/todo_comments.vim
@@ -0,0 +1,17 @@
+if exists('g:loaded_todo_comments')
+	finish
+endif
+let g:loaded_todo = 1
+
+
+nnoremap <silent> <Plug>(todo-comments-previous) :<C-u>call todo_comments#PreviousTODO()<CR>
+nnoremap <silent> <Plug>(todo-comments-next) :<C-u>call todo_comments#NextTODO()<CR>
+
+
+if !hasmapto('<Plug>(todo-comments-previous)', 'n') && !maparg('[t', 'n')
+	nmap [t <Plug>(todo-comments-previous)
+endif
+
+if !hasmapto('<Plug>(todo-comments-next)', 'n') && !maparg(']t', 'n')
+	nmap ]t <Plug>(todo-comments-next)
+endif
diff --git a/bundle/todo/plugin/todo.vim b/bundle/todo/plugin/todo.vim
deleted file mode 100644
index f4358a6..0000000
--- a/bundle/todo/plugin/todo.vim
+++ /dev/null
@@ -1,17 +0,0 @@
-if exists('g:loaded_todo')
-	finish
-endif
-let g:loaded_todo = 1
-
-
-nnoremap <silent> <Plug>(todo-previous) :<C-u>call todo#PreviousTODO()<CR>
-nnoremap <silent> <Plug>(todo-next) :<C-u>call todo#NextTODO()<CR>
-
-
-if !hasmapto('<Plug>(todo-previous)', 'n') && !maparg('[t', 'n')
-	nmap [t <Plug>(todo-previous)
-endif
-
-if !hasmapto('<Plug>(todo-next)', 'n') && !maparg(']t', 'n')
-	nmap ]t <Plug>(todo-next)
-endif