Change editorial brand names to provide better defaults and to prevent current and future string collisions (bug 1055851)

yolo