1 files changed, 2 insertions, 2 deletions
diff --git a/lib/puppet/parser/lexer.rb b/lib/puppet/parser/lexer.rb
index bc1e99f65..371960c91 100644
--- a/lib/puppet/parser/lexer.rb
+++ b/lib/puppet/parser/lexer.rb
@@ -41,8 +41,8 @@ module Puppet
                 %r{\?} => :QMARK,
                 %r{\\} => :BACKSLASH,
                 %r{=>} => :FARROW,
-                %r{[a-z]\w*} => :NAME,
-                %r{[A-Z]\w*} => :TYPE,
+                %r{[a-z][-\w]*} => :NAME,
+                %r{[A-Z][-\w]*} => :TYPE,
                 %r{[0-9]+} => :NUMBER,
                 %r{\$\w+} => :VARIABLE
             }