r285: rename if-2 to if2