Updated for renamed plugins