Separate actor name and role

Moved actor role to label2. Simplifies code and gives skinners greater
flexibility.