Adding token. Some name cleanup.