Update and rename pluginxxx.xml to plugin.xml