Moved service provider for renaming
Moved for renaming case