Refactor abstract service names
TokenApi updates + delete, fixes & tests
Housekeeping