use Plugin* instead Bundle*

- closes many issues )