Addressed romainneutron comments
Rename Service Provider