Rename subscriber implementation to be more explicit...