Updated references to match changes in drupal repository