Renamed at-specific tokens to make them consistent with usage in repositext.