diff --git a/autoload/tagbar.vim b/autoload/tagbar.vim
index 483d9d6..3e290b8 100644
--- a/autoload/tagbar.vim
+++ b/autoload/tagbar.vim
@@ -117,9 +117,9 @@ function! s:InitTypes() abort
     let supported_types = s:GetSupportedFiletypes()
 
     if s:ctags_is_uctags
-        let s:known_types = tagbar#typedefs#uctags#init(supported_types)
+        let s:known_types = tagbar#types#uctags#init(supported_types)
     else
-        let s:known_types = tagbar#typedefs#ctags#init(supported_types)
+        let s:known_types = tagbar#types#ctags#init(supported_types)
     endif
 
     " Use jsctags/doctorjs if available
diff --git a/autoload/tagbar/typedefs/ctags.vim b/autoload/tagbar/types/ctags.vim
similarity index 99%
rename from autoload/tagbar/typedefs/ctags.vim
rename to autoload/tagbar/types/ctags.vim
index 612c3d5..4802e1d 100644
--- a/autoload/tagbar/typedefs/ctags.vim
+++ b/autoload/tagbar/types/ctags.vim
@@ -1,6 +1,6 @@
 " Type definitions for standard Exuberant Ctags
 
-function! tagbar#typedefs#ctags#init(supported_types) abort
+function! tagbar#types#ctags#init(supported_types) abort
     let types = {}
 
     " Ant {{{1
diff --git a/autoload/tagbar/typedefs/uctags.vim b/autoload/tagbar/types/uctags.vim
similarity index 99%
rename from autoload/tagbar/typedefs/uctags.vim
rename to autoload/tagbar/types/uctags.vim
index 5aead15..ff6913e 100644
--- a/autoload/tagbar/typedefs/uctags.vim
+++ b/autoload/tagbar/types/uctags.vim
@@ -1,6 +1,6 @@
 " Type definitions for Universal Ctags
 
-function! tagbar#typedefs#uctags#init(supported_types) abort
+function! tagbar#types#uctags#init(supported_types) abort
     let types = {}
 
     " Ant {{{1