Some minor cleaning up [ci skip].
Some work towards renaming some plugins (#339) [ci skip].