Changed naming of controller plugins