cleaned up naming convention, actor no longer in actor name