Replace public use of "Target" with "ServiceProvider"