(bug 42206) Rename ambassador roles

Change-Id: I25637061dcd275ba2cf7fc4a053ebb2430e4b75e