Moving more plugins for consistent naming