SERVER-8328 Make naming for roles consistent