Fix up references to EclipseUtil scope methods