Renamed classes and updated code accordingly.
Update unsubSubscriber params