Renamed Plugin
Fixed merge conflicts