Fix name of dataproviders

Change-Id: I20e9c15c87a32c7dcb3d26106fc1d45d79c2e9eb
Merge "Fix name of dataproviders"