changed singular names of data/token fields to plural for consistency