rebase to split perso/pro aliases