Removing _l3 from Apex scenario names in master