Divertion transporter fixes, including name change