Some work towards renaming some plugins (#339).