Fix cases where old Osirium code clashes with neutrinordp