Renamed pluginbundle to plugin. Renamed pluginbundlelistener to pluginlistener