Reverts provider/type naming.