Continue to break out the old role stuff into better role names