rename the swicthes to be inline with the ticket number and split between BE...

rename the swicthes to be inline with the ticket number and split between BE and non-BE, non-BE deactivated first to get a first all green pipepline