#57 Refactor : rename to WaitProcessor