modified to reflect plugin name changes.