Fixed a name parsing bug when an additional token was included