tokenPrefix and tokenName refactoring