Rename all providers by removing the Provider suffix