diff --git a/ftplugin/dart.vim b/ftplugin/dart.vim
index 778e857..934d721 100644
--- a/ftplugin/dart.vim
+++ b/ftplugin/dart.vim
@@ -25,5 +25,6 @@ let &l:errorformat =
 
 setlocal includeexpr=dart#resolveUri(v:fname)
 setlocal isfname+=:
+setlocal iskeyword+=$
 
 let b:undo_ftplugin = 'setl et< fo< sw< sts< com< cms< inex< isf<'
diff --git a/syntax/dart.vim b/syntax/dart.vim
index ca75910..0dbc2de 100644
--- a/syntax/dart.vim
+++ b/syntax/dart.vim
@@ -53,7 +53,7 @@ syntax match dartNumber         "\<\d\+\(\.\d\+\)\=\>"
 
 " User Types
 if !exists('dart_highlight_types') || dart_highlight_types
-  syntax match dartTypeName   "\<[A-Z]\w*\>\|\<_[A-Z]\w*\>"
+  syntax match dartTypeName   "\<_\?\u[[:alnum:]_\$]*\>"
 endif
 
 " Core libraries