+ fix Provider prefix
+ Fix resource file override