Adding __ prefix to abstract waiters