TODO: added plugin renames