Refactoring name/id plugins