Fixed plugin namming conventions