Remove remaining PROVIDER references

Change-Id: I0bfcd7136ec0329cfe15983278c25f6b62415b68
Reviewed-by: Eike Ziller <eike.ziller@digia.com>