Update to new Drupal distro naming conventions