Renamed Waitress => mediator for c
larity
Renamed Waitress to mediator for clarity and consistency