adjust naming for conventions used in pluginator, fix tests