diff --git a/core/modules/shortcut/lib/Drupal/shortcut/Entity/ShortcutSet.php b/core/modules/shortcut/lib/Drupal/shortcut/Entity/ShortcutSet.php
index c9dee356f09ee38e4c3ca921032520d73d9682d8..44e0e15bef9c73033237820ac32b75952ae6bc3d 100644
--- a/core/modules/shortcut/lib/Drupal/shortcut/Entity/ShortcutSet.php
+++ b/core/modules/shortcut/lib/Drupal/shortcut/Entity/ShortcutSet.php
@@ -111,7 +111,7 @@ public static function preDelete(EntityStorageControllerInterface $storage_contr
   public function resetLinkWeights() {
     $weight = -50;
     foreach ($this->getShortcuts() as $shortcut) {
-      $shortcut->weight->value = ++$weight;
+      $shortcut->setWeight(++$weight);
       $shortcut->save();
     }
 
diff --git a/core/modules/shortcut/lib/Drupal/shortcut/Form/SetCustomize.php b/core/modules/shortcut/lib/Drupal/shortcut/Form/SetCustomize.php
index 12a789c0a78bab95afb7f8691533073aff6cdec0..e57770de36077c8d4c24dd41f3ee6d84fe8ba378 100644
--- a/core/modules/shortcut/lib/Drupal/shortcut/Form/SetCustomize.php
+++ b/core/modules/shortcut/lib/Drupal/shortcut/Form/SetCustomize.php
@@ -70,13 +70,13 @@ public function form(array $form, array &$form_state) {
     foreach ($shortcuts as $shortcut) {
       $id = $shortcut->id();
       $form['shortcuts']['links'][$id]['#attributes']['class'][] = 'draggable';
-      $form['shortcuts']['links'][$id]['name']['#markup'] = l($shortcut->title->value, $shortcut->path->value);
-      $form['shortcuts']['links'][$id]['#weight'] = $shortcut->weight->value;
+      $form['shortcuts']['links'][$id]['name']['#markup'] = l($shortcut->getTitle(), $shortcut->path->value);
+      $form['shortcuts']['links'][$id]['#weight'] = $shortcut->getWeight();
       $form['shortcuts']['links'][$id]['weight'] = array(
         '#type' => 'weight',
-        '#title' => t('Weight for @title', array('@title' => $shortcut->title->value)),
+        '#title' => t('Weight for @title', array('@title' => $shortcut->getTitle())),
         '#title_display' => 'invisible',
-        '#default_value' => $shortcut->weight->value,
+        '#default_value' => $shortcut->getWeight(),
         '#attributes' => array('class' => array('shortcut-weight')),
       );
 
@@ -121,7 +121,7 @@ protected function actions(array $form, array &$form_state) {
   public function save(array $form, array &$form_state) {
     $shortcuts = $this->storageController->loadByProperties(array('shortcut_set' => $this->entity->id()));
     foreach ($shortcuts as $shortcut) {
-      $shortcut->weight->value = $form_state['values']['shortcuts']['links'][$shortcut->id()]['weight'];
+      $shortcut->setWeight($form_state['values']['shortcuts']['links'][$shortcut->id()]['weight']);
       $shortcut->save();
     }
     drupal_set_message(t('The shortcut set has been updated.'));
diff --git a/core/modules/shortcut/lib/Drupal/shortcut/ShortcutFormController.php b/core/modules/shortcut/lib/Drupal/shortcut/ShortcutFormController.php
index 5f7267918c419701e9605d8bae6c27d5b29b77db..56f1487044cf93172280b086d98a0a741cd79651 100644
--- a/core/modules/shortcut/lib/Drupal/shortcut/ShortcutFormController.php
+++ b/core/modules/shortcut/lib/Drupal/shortcut/ShortcutFormController.php
@@ -83,7 +83,7 @@ public function form(array $form, array &$form_state) {
     $form['title'] = array(
       '#type' => 'textfield',
       '#title' => t('Name'),
-      '#default_value' => $entity->title->value,
+      '#default_value' => $entity->getTitle(),
       '#size' => 40,
       '#maxlength' => 255,
       '#required' => TRUE,
@@ -154,10 +154,10 @@ public function save(array $form, array &$form_state) {
     $entity->save();
 
     if ($entity->isNew()) {
-      $message = $this->t('The shortcut %link has been updated.', array('%link' => $entity->title->value));
+      $message = $this->t('The shortcut %link has been updated.', array('%link' => $entity->getTitle()));
     }
     else {
-      $message = $this->t('Added a shortcut for %title.', array('%title' => $entity->title->value));
+      $message = $this->t('Added a shortcut for %title.', array('%title' => $entity->getTitle()));
     }
     drupal_set_message($message);
 
diff --git a/core/modules/shortcut/lib/Drupal/shortcut/Tests/ShortcutLinksTest.php b/core/modules/shortcut/lib/Drupal/shortcut/Tests/ShortcutLinksTest.php
index 9025e535ab06f0cb0e5b6964dfdea0d9a1f23334..f367ec9d06c714bcde072f398e098e42ac41b353 100644
--- a/core/modules/shortcut/lib/Drupal/shortcut/Tests/ShortcutLinksTest.php
+++ b/core/modules/shortcut/lib/Drupal/shortcut/Tests/ShortcutLinksTest.php
@@ -111,7 +111,7 @@ public function testShortcutLinkChangePath() {
 
     $shortcuts = $set->getShortcuts();
     $shortcut = reset($shortcuts);
-    $this->drupalPostForm('admin/config/user-interface/shortcut/link/' . $shortcut->id(), array('title' => $shortcut->title->value, 'path' => $new_link_path), t('Save'));
+    $this->drupalPostForm('admin/config/user-interface/shortcut/link/' . $shortcut->id(), array('title' => $shortcut->getTitle(), 'path' => $new_link_path), t('Save'));
     $saved_set = shortcut_set_load($set->id());
     $paths = $this->getShortcutInformation($saved_set, 'path');
     $this->assertTrue(in_array($new_link_path, $paths), 'Shortcut path changed: ' . $new_link_path);