Add new aliases for role names.
Bug fixes