rename some generic types from A to Token