minor tweaks to plugins to use proper names