Consistent factory naming

- Changed role provider factory class and it's property naming to more
consistent one. Because it seemed like it was returning it's singleton
factory instance, not the current provider's instance.