Adding new update function to make sure that old-style token names are properly translated, as discovered in issue #1364320
