rename waiter to waiter_soft