Rename methods on token service