diff --git a/src/token.rs b/src/token.rs
index 2636cee..3851fb2 100644
--- a/src/token.rs
+++ b/src/token.rs
@@ -562,7 +562,7 @@
     "become"      pub struct Become       /// `become`
     "box"         pub struct Box          /// `box`
     "break"       pub struct Break        /// `break`
-    "Self"        pub struct CapSelf      /// `Self`
+    "Self"        pub struct SelfType     /// `Self`
     "const"       pub struct Const        /// `const`
     "continue"    pub struct Continue     /// `continue`
     "crate"       pub struct Crate        /// `crate`
@@ -591,7 +591,7 @@
     "pub"         pub struct Pub          /// `pub`
     "ref"         pub struct Ref          /// `ref`
     "return"      pub struct Return       /// `return`
-    "self"        pub struct Self_        /// `self`
+    "self"        pub struct SelfValue    /// `self`
     "static"      pub struct Static       /// `static`
     "struct"      pub struct Struct       /// `struct`
     "super"       pub struct Super        /// `super`
@@ -683,7 +683,7 @@
     (become)      => { $crate::token::Become };
     (box)         => { $crate::token::Box };
     (break)       => { $crate::token::Break };
-    (Self)        => { $crate::token::CapSelf };
+    (Self)        => { $crate::token::SelfType };
     (const)       => { $crate::token::Const };
     (continue)    => { $crate::token::Continue };
     (crate)       => { $crate::token::Crate };
@@ -712,7 +712,7 @@
     (pub)         => { $crate::token::Pub };
     (ref)         => { $crate::token::Ref };
     (return)      => { $crate::token::Return };
-    (self)        => { $crate::token::Self_ };
+    (self)        => { $crate::token::SelfValue };
     (static)      => { $crate::token::Static };
     (struct)      => { $crate::token::Struct };
     (super)       => { $crate::token::Super };