Rename Plug-ins

+1. We have been asking for this for years: