Hacked the name token definition to be a bit more liberal on cpp types.