Update roles to reflect utility consolidation