More token naming changes.
Check for loaded languages before attempting to augment/reference them.