Rename the base class for the provider..

Heh, github is pretty unhappy with merging this, as I've broken things out into individual branches for pull requesting... To apply you probably need to be cherry-picking the top commit..

Anyway, the actual change to your stuff is to rename the base class into an 'approved' namespace.

Further thoughts/review to follow :)