Fixed token name and added to self-closing tags list