Cleanup + fix plugin name