Made token names more consistent.
PEP8