Fix plug-in names and plug-in provider
3 files changed