Updated all references to token[1] to name