diff --cc core/modules/migrate_drupal/src/Tests/d6/MigrateCommentTest.php
index 731515d,d144a5f..0000000
--- a/core/modules/migrate_drupal/src/Tests/d6/MigrateCommentTest.php
+++ b/core/modules/migrate_drupal/src/Tests/d6/MigrateCommentTest.php
@@@ -79,10 -70,9 +79,10 @@@ class MigrateCommentTest extends Migrat
      $this->assertEqual('The first comment body.', $comment->comment_body->value);
      $this->assertEqual('filtered_html', $comment->comment_body->format);
      $this->assertEqual(0, $comment->pid->target_id);
 -    $this->assertEqual(1, $comment->entity_id->target_id);
 -    $this->assertEqual('node', $comment->entity_type->value);
 +    $this->assertEqual(1, $comment->getCommentedEntityId());
 +    $this->assertEqual('node', $comment->getCommentedEntityTypeId());
-     $this->assertEqual(LanguageInterface::LANGCODE_NOT_SPECIFIED, $comment->language()->id);
+     $this->assertEqual(LanguageInterface::LANGCODE_NOT_SPECIFIED, $comment->language()->getId());
 +    $this->assertEqual('comment_no_subject', $comment->getTypeId());
  
      $comment = entity_load('comment', 2);
      $this->assertEqual('The response to the second comment.', $comment->subject->value);
diff --cc core/modules/system/system.module
index 117dc49,a9c1648..0000000
--- a/core/modules/system/system.module
+++ b/core/modules/system/system.module
@@@ -980,8 -980,8 +980,8 @@@ function system_page_build(&$page) 
        array(
          'path' => current_path(),
          'front' => drupal_is_front_page(),
-         'language' => \Drupal::languageManager()->getCurrentLanguage(LanguageInterface::TYPE_URL)->id,
+         'language' => \Drupal::languageManager()->getCurrentLanguage(LanguageInterface::TYPE_URL)->getId(),
 -        'query' => \Drupal::service('request')->query->all(),
 +        'query' => \Drupal::request()->query->all(),
        )
      );
    }