Renaming interfaces

- renamed interfaces to indicate the behaviour being exhibited
- saga stuff confused me a little, so avoided changes

Open to comments and suggestions.

I'm very aware that there could be pushback on this, but let's see.