fixing token name and token content