Resolved issues with plugin names referencing deprecated plugin names