fix wrong defined type names
remove roles from everlast