Renaming of plugin components

Better now then later =P