Fixed #1157: Rename when_n/wait_n, add when_xxx_n/wait_xxx_n

The title says it - fixing #1157