Rename some class name and improve plugin.xml