Rename Base<Provider>Entry to Abstract<Provider>Entry