diff --git a/core/modules/menu/lib/Drupal/menu/Form/MenuDeleteForm.php b/core/modules/menu/lib/Drupal/menu/Form/MenuDeleteForm.php
index 57e45c1..e1acd0d 100644
--- a/core/modules/menu/lib/Drupal/menu/Form/MenuDeleteForm.php
+++ b/core/modules/menu/lib/Drupal/menu/Form/MenuDeleteForm.php
@@ -34,7 +34,8 @@ class MenuDeleteForm extends EntityConfirmFormBase {
   /**
    * Constructs a new MenuDeleteForm.
    *
-   * @param \Drupal\Core\Entity\EntityStorageControllerInterface $storage_controller
+   * @param \Drupal\Core\Entity\EntityStorageControllerInterface 
+   *   $storage_controller
    *   The menu link storage controller.
    * @param \Drupal\Core\Database\Connection $connection
    *   The database connection.
diff --git a/core/modules/menu/lib/Drupal/menu/MenuFormController.php b/core/modules/menu/lib/Drupal/menu/MenuFormController.php
index ea2db6b..dae06b5 100644
--- a/core/modules/menu/lib/Drupal/menu/MenuFormController.php
+++ b/core/modules/menu/lib/Drupal/menu/MenuFormController.php
@@ -45,7 +45,8 @@ class MenuFormController extends EntityFormController {
    *
    * @param \Drupal\Core\Entity\Query\QueryFactory $entity_query_factory
    *   The factory for entity queries.
-   * @param \Drupal\menu_link\MenuLinkStorageControllerInterface $menu_link_storage
+   * @param \Drupal\menu_link\MenuLinkStorageControllerInterface 
+   *   $menu_link_storage
    *   The menu link storage controller.
    */
   public function __construct(QueryFactory $entity_query_factory, MenuLinkStorageControllerInterface $menu_link_storage) {
@@ -127,7 +128,7 @@ class MenuFormController extends EntityFormController {
     // Add menu links administration form for existing menus.
     if (!$menu->isNew() || $menu->isLocked()) {
       // Form API supports constructing and validating self-contained sections
-      // within forms, but does not allow to handle the form section's 
+      // within forms, but does not allow to handle the form section's
       // submission equally separated yet. Therefore, we use a $form_state key
       // to point to the parents of the form section.
       // @see self::submitOverviewForm()
diff --git a/core/modules/menu/lib/Drupal/menu/Tests/MenuLanguageTest.php b/core/modules/menu/lib/Drupal/menu/Tests/MenuLanguageTest.php
index 7c5d954..7702689 100644
--- a/core/modules/menu/lib/Drupal/menu/Tests/MenuLanguageTest.php
+++ b/core/modules/menu/lib/Drupal/menu/Tests/MenuLanguageTest.php
@@ -22,9 +22,12 @@ class MenuLanguageTest extends MenuWebTestBase {
    */
   public static $modules = array('language');
 
-  protected $admin_user;
+  protected $adminUser;
   protected $menu;
 
+  /**
+   * {@inheritdoc}
+   */
   public static function getInfo() {
     return array(
       'name' => 'Menu language',
@@ -33,12 +36,15 @@ class MenuLanguageTest extends MenuWebTestBase {
     );
   }
 
+  /**
+   * {@inheritdoc}
+   */
   public function setUp() {
     parent::setUp();
 
     // Create user.
-    $this->admin_user = $this->drupalCreateUser(array('access administration pages', 'administer menu'));
-    $this->drupalLogin($this->admin_user);
+    $this->adminUser = $this->drupalCreateUser(array('access administration pages', 'administer menu'));
+    $this->drupalLogin($this->adminUser);
 
     // Add some custom languages.
     foreach (array('aa', 'bb', 'cc', 'cs') as $language_code) {
diff --git a/core/modules/menu/lib/Drupal/menu/Tests/MenuNodeTest.php b/core/modules/menu/lib/Drupal/menu/Tests/MenuNodeTest.php
index ac5ebbb..0464ffe 100644
--- a/core/modules/menu/lib/Drupal/menu/Tests/MenuNodeTest.php
+++ b/core/modules/menu/lib/Drupal/menu/Tests/MenuNodeTest.php
@@ -21,6 +21,9 @@ class MenuNodeTest extends WebTestBase {
    */
   public static $modules = array('menu', 'test_page_test', 'node');
 
+  /**
+   * {@inheritdoc}
+   */
   public static function getInfo() {
     return array(
       'name' => 'Menu settings for nodes',
@@ -29,6 +32,9 @@ class MenuNodeTest extends WebTestBase {
     );
   }
 
+  /**
+   * {@inheritdoc}
+   */
   public function setUp() {
     parent::setUp();
     $this->drupalCreateContentType(array('type' => 'page', 'name' => 'Basic page'));
diff --git a/core/modules/menu/lib/Drupal/menu/Tests/MenuTest.php b/core/modules/menu/lib/Drupal/menu/Tests/MenuTest.php
index 6766a4c..14c57a1 100644
--- a/core/modules/menu/lib/Drupal/menu/Tests/MenuTest.php
+++ b/core/modules/menu/lib/Drupal/menu/Tests/MenuTest.php
@@ -24,14 +24,14 @@ class MenuTest extends MenuWebTestBase {
    *
    * @var \Drupal\user\Entity\User
    */
-  protected $admin_user;
+  protected $adminUser;
 
   /**
    * An authenticated user.
    *
    * @var \Drupal\user\Entity\User
    */
-  protected $authenticated_user;
+  protected $authenticatedUser;
 
   /**
    * A test menu.
@@ -47,6 +47,9 @@ class MenuTest extends MenuWebTestBase {
    */
   protected $items;
 
+  /**
+   * {@inheritdoc}
+   */
   public static function getInfo() {
     return array(
       'name' => 'Menu link creation/deletion',
@@ -55,14 +58,17 @@ class MenuTest extends MenuWebTestBase {
     );
   }
 
+  /**
+   * {@inheritdoc}
+   */
   public function setUp() {
     parent::setUp();
 
     $this->drupalCreateContentType(array('type' => 'article', 'name' => 'Article'));
 
     // Create users.
-    $this->admin_user = $this->drupalCreateUser(array('access administration pages', 'administer blocks', 'administer menu', 'create article content'));
-    $this->authenticated_user = $this->drupalCreateUser(array());
+    $this->adminUser = $this->drupalCreateUser(array('access administration pages', 'administer blocks', 'administer menu', 'create article content'));
+    $this->authenticatedUser = $this->drupalCreateUser(array());
   }
 
   /**
@@ -70,7 +76,7 @@ class MenuTest extends MenuWebTestBase {
    */
   public function testMenu() {
     // Login the user.
-    $this->drupalLogin($this->admin_user);
+    $this->drupalLogin($this->adminUser);
     $this->items = array();
 
     $this->menu = $this->addCustomMenu();
@@ -86,7 +92,7 @@ class MenuTest extends MenuWebTestBase {
     $this->assertIdentical($before_count, $after_count, 'menu_link_rebuild_defaults() does not add more links');
     // Do standard user tests.
     // Login the user.
-    $this->drupalLogin($this->authenticated_user);
+    $this->drupalLogin($this->authenticatedUser);
     $this->verifyAccess(403);
     foreach ($this->items as $item) {
       // Paths were set as 'node/$nid'.
@@ -95,7 +101,7 @@ class MenuTest extends MenuWebTestBase {
     }
 
     // Login the administrator.
-    $this->drupalLogin($this->admin_user);
+    $this->drupalLogin($this->adminUser);
 
     // Delete menu links.
     foreach ($this->items as $item) {
@@ -402,7 +408,7 @@ class MenuTest extends MenuWebTestBase {
    * Adds and removes a menu link with a query string and fragment.
    */
   public function testMenuQueryAndFragment() {
-    $this->drupalLogin($this->admin_user);
+    $this->drupalLogin($this->adminUser);
 
     // Make a path with query and fragment on.
     $path = 'test-page?arg1=value1&arg2=value2';
@@ -422,7 +428,7 @@ class MenuTest extends MenuWebTestBase {
    * Tests renaming the built-in menu.
    */
   public function testSystemMenuRename() {
-    $this->drupalLogin($this->admin_user);
+    $this->drupalLogin($this->adminUser);
     $edit = array(
       'label' => $this->randomName(16),
     );
@@ -451,7 +457,7 @@ class MenuTest extends MenuWebTestBase {
     // Test that a user with 'administer menu' but without 'bypass node access'
     // cannot see the menu item.
     $this->drupalLogout();
-    $this->drupalLogin($this->admin_user);
+    $this->drupalLogin($this->adminUser);
     $this->drupalGet('admin/structure/menu/manage/' . $item['menu_name']);
     $this->assertNoText($item['link_title'], "Menu link pointing to unpublished node is only visible to users with 'bypass node access' permission");
   }
@@ -542,7 +548,7 @@ class MenuTest extends MenuWebTestBase {
    * Tests menu link bundles.
    */
   public function testMenuBundles() {
-    $this->drupalLogin($this->admin_user);
+    $this->drupalLogin($this->adminUser);
     $menu = $this->addCustomMenu();
     // Clear the entity info cache to ensure the static caches are rebuilt.
     entity_info_cache_clear();
@@ -579,7 +585,7 @@ class MenuTest extends MenuWebTestBase {
    *   Menu name. Defaults to 'tools'.
    * @param bool $expanded
    *   Whether or not this menu link is expanded. Setting this to TRUE should
-   *   test whether it works when we do the authenticated_user tests. Defaults
+   *   test whether it works when we do the authenticatedUser tests. Defaults
    *   to FALSE.
    * @param string $weight
    *   Menu weight. Defaults to 0.
@@ -825,7 +831,7 @@ class MenuTest extends MenuWebTestBase {
 
     // Do standard user tests.
     // Login the user.
-    $this->drupalLogin($this->authenticated_user);
+    $this->drupalLogin($this->authenticatedUser);
     $this->drupalGetAJAX('admin/structure/menu/parents');
     $this->assertResponse(403);
   }
diff --git a/core/modules/menu/lib/Drupal/menu/Tests/MenuUninstallTest.php b/core/modules/menu/lib/Drupal/menu/Tests/MenuUninstallTest.php
index 6815f02..5f0aaee 100644
--- a/core/modules/menu/lib/Drupal/menu/Tests/MenuUninstallTest.php
+++ b/core/modules/menu/lib/Drupal/menu/Tests/MenuUninstallTest.php
@@ -21,6 +21,9 @@ class MenuUninstallTest extends WebTestBase {
    */
   public static $modules = array('menu');
 
+  /**
+   * {@inheritdoc}
+   */
   public static function getInfo() {
     return array(
       'name' => 'Uninstall menu test',