Subscription overhaul2

Renamed and changed things according to comments in #603