Fix design choice
Fix example after carrier rename