Renamed Providers and added publishers