diff --git a/core/modules/breakpoint/breakpoint.module b/core/modules/breakpoint/breakpoint.module
index ad1abd6..fdf2c2b 100644
--- a/core/modules/breakpoint/breakpoint.module
+++ b/core/modules/breakpoint/breakpoint.module
@@ -197,7 +197,7 @@ function _breakpoint_delete_breakpoints($list, $source_type) {
   $breakpoint_groups = entity_load_multiple('breakpoint_group', $ids);
 
   foreach ($breakpoint_groups as $breakpoint_group) {
-    if ($breakpoint_group->sourceType == $source_type && in_array($breakpoint_group->source, $list)) {
+    if ($breakpoint_group->getSourceType() == $source_type && in_array($breakpoint_group->getSource(), $list)) {
       // Delete the automatically created breakpoint group.
       $breakpoint_group->delete();
 
@@ -239,7 +239,7 @@ function _breakpoint_delete_breakpoints($list, $source_type) {
 function _breakpoint_delete_breakpoint_groups($group_id, $source_type) {
   $breakpoint_groups = entity_load_multiple('breakpoint_group');
   foreach ($breakpoint_groups as $breakpoint_group) {
-    if ($breakpoint_group->sourceType == $source_type && $breakpoint_group->source == $group_id) {
+    if ($breakpoint_group->getSourceType() == $source_type && $breakpoint_group->getSource() == $group_id) {
       $breakpoint_group->delete();
     }
   }
diff --git a/core/modules/breakpoint/lib/Drupal/breakpoint/BreakpointGroupInterface.php b/core/modules/breakpoint/lib/Drupal/breakpoint/BreakpointGroupInterface.php
index 59833ff..603dfbc 100644
--- a/core/modules/breakpoint/lib/Drupal/breakpoint/BreakpointGroupInterface.php
+++ b/core/modules/breakpoint/lib/Drupal/breakpoint/BreakpointGroupInterface.php
@@ -4,7 +4,6 @@
  * @file
  * Contains \Drupal\breakpoint\Entity\BreakpointGroupInterface.
  */
-
 namespace Drupal\breakpoint;
 
 use Drupal\Core\Config\Entity\ConfigEntityInterface;
@@ -14,6 +13,107 @@
  */
 interface BreakpointGroupInterface extends ConfigEntityInterface {
 
+	/**
+	 * Sets the breakpoint group id.
+	 *
+	 * @param string $id
+	 *  The breakpoint group id
+	 */
+	public function setId($id);
+
+  /**
+   * Returns the breakpoint group machine name.
+   *
+   * @return string
+   * The breakpoint group machine name
+   */
+  public function getName();
+
+  /**
+   * Sets the breakpoint group machine name.
+   *
+   * @param string $name
+   * The breakpoint group machine name
+   *
+   * @return \Drupal\breakpoint\BreakpointGroup\Interface
+   * The called breakpoint group entity
+   */
+  public function setName($name);
+
+  /**
+   * Sets the breakpoint group label.
+   *
+   * @param string $label
+   * The breakpoint group label
+   *
+   * @return \Drupal\breakpoint\BreakpointGroup\Interface
+   * The called breakpoint group entity
+   */
+  public function setLabel($label);
+
+  /**
+   * Returns the breakpoint group breakpoints.
+   *
+   * @return array
+   * Array containing all breakpoints of this group.
+   */
+  public function getBreakpoints();
+
+  /**
+   * Sets the breakpoint group breakpoints.
+   *
+   * @param array $breakpoints
+   * The breakpoint group breakpoints
+   *
+   * @return \Drupal\breakpoint\BreakpointGroup\Interface
+   * The called breakpoint group entity
+   */
+  public function setBreakpoints(array $breakpoints);
+
+  /**
+   * Returns the breakpoint group source.
+   *
+   * @return string
+   * The breakpoint group source: theme or module name, Or
+   * 'user' for user-created groups.
+   */
+  public function getSource();
+
+  /**
+   * Sets the breakpoint group source: theme or module name,
+   * or 'user' for user-created groups.
+   *
+   * @param string $source
+   * The breakpoint group source
+   *
+   * @return \Drupal\breakpoint\BreakpointGroup\Interface
+   * The called breakpoint group entity
+   */
+  public function setSource($source);
+
+  /**
+   * Returns the breakpoint group source type.
+   *
+   * @return string
+   * The breakpoint group source type
+   */
+  public function getSourceType();
+
+  /**
+   * Sets the breakpoint group source type.
+   *
+   * @param string $source_type
+   * The breakpoint group source
+   * Allowed values:
+   * Breakpoint::SOURCE_TYPE_THEME
+   * Breakpoint::SOURCE_TYPE_MODULE
+   * Breakpoint::SOURCE_TYPE_USER_DEFINED
+   *
+   * @return \Drupal\breakpoint\BreakpointGroup\Interface
+   * The called breakpoint group entity
+   */
+  public function setSourceType($sourceType);
+
   /**
    * Checks if the breakpoint group is valid.
    *
@@ -21,7 +121,7 @@
    * @throws \Drupal\breakpoint\InvalidBreakpointSourceException
    *
    * @return bool
-   *   Returns TRUE if the breakpoint group is valid.
+   * Returns TRUE if the breakpoint group is valid.
    */
   public function isValid();
 
@@ -29,9 +129,9 @@ public function isValid();
    * Adds a breakpoint using a name and a media query.
    *
    * @param string $name
-   *   The name of the breakpoint.
+   * The name of the breakpoint.
    * @param string $media_query
-   *   Media query.
+   * Media query.
    */
   public function addBreakpointFromMediaQuery($name, $media_query);
 
@@ -41,7 +141,7 @@ public function addBreakpointFromMediaQuery($name, $media_query);
    * The breakpoint name is either the machine_name or the ID of a breakpoint.
    *
    * @param array $breakpoints
-   *   Array containing breakpoints keyed by their ID.
+   * Array containing breakpoints keyed by their ID.
    */
   public function addBreakpoints($breakpoints);
 
diff --git a/core/modules/breakpoint/lib/Drupal/breakpoint/Entity/BreakpointGroup.php b/core/modules/breakpoint/lib/Drupal/breakpoint/Entity/BreakpointGroup.php
index 774890d..22f615f 100644
--- a/core/modules/breakpoint/lib/Drupal/breakpoint/Entity/BreakpointGroup.php
+++ b/core/modules/breakpoint/lib/Drupal/breakpoint/Entity/BreakpointGroup.php
@@ -18,22 +18,21 @@
  * Defines the BreakpointGroup entity.
  *
  * @EntityType(
- *   id = "breakpoint_group",
- *   label = @Translation("Breakpoint group"),
- *   module = "breakpoint",
- *   controllers = {
- *     "storage" = "Drupal\Core\Config\Entity\ConfigStorageController"
- *   },
- *   config_prefix = "breakpoint.breakpoint_group",
- *   entity_keys = {
- *     "id" = "id",
- *     "label" = "label",
- *     "uuid" = "uuid"
- *   }
+ * id = "breakpoint_group",
+ * label = @Translation("Breakpoint group"),
+ * module = "breakpoint",
+ * controllers = {
+ * "storage" = "Drupal\Core\Config\Entity\ConfigStorageController"
+ * },
+ * config_prefix = "breakpoint.breakpoint_group",
+ * entity_keys = {
+ * "id" = "id",
+ * "label" = "label",
+ * "uuid" = "uuid"
+ * }
  * )
  */
 class BreakpointGroup extends ConfigEntityBase implements BreakpointGroupInterface {
-
   /**
    * The breakpoint group ID.
    *
@@ -66,7 +65,7 @@ class BreakpointGroup extends ConfigEntityBase implements BreakpointGroupInterfa
    * The breakpoint group breakpoints.
    *
    * @var array
-   *   Array containing all breakpoints of this group.
+   * Array containing all breakpoints of this group.
    *
    * @see Drupal\breakpoint\Entity\Breakpoint
    */
@@ -84,10 +83,10 @@ class BreakpointGroup extends ConfigEntityBase implements BreakpointGroupInterfa
    * The breakpoint group source type.
    *
    * @var string
-   *   Allowed values:
-   *     Breakpoint::SOURCE_TYPE_THEME
-   *     Breakpoint::SOURCE_TYPE_MODULE
-   *     Breakpoint::SOURCE_TYPE_USER_DEFINED
+   * Allowed values:
+   * Breakpoint::SOURCE_TYPE_THEME
+   * Breakpoint::SOURCE_TYPE_MODULE
+   * Breakpoint::SOURCE_TYPE_USER_DEFINED
    *
    * @see Drupal\breakpoint\Entity\Breakpoint
    */
@@ -97,23 +96,93 @@ class BreakpointGroup extends ConfigEntityBase implements BreakpointGroupInterfa
    * Overrides Drupal\config\ConfigEntityBase::__construct().
    */
   public function __construct(array $values, $entity_type) {
-    parent::__construct($values, $entity_type);
+    parent::__construct($values,$entity_type);
     $this->loadAllBreakpoints();
   }
 
   /**
+   * {@inheritdoc}
+   */
+  public function setId($id) {
+    return $this->set('id',$id);
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  public function getName() {
+    return $this->get('name');
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  public function setName($name) {
+    return $this->set('name',$name);
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  public function setLabel($label) {
+    return $this->set('label',$label);
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  public function getBreakpoints() {
+    return $this->get('breakpoints');
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  public function setBreakpoints(array $breakpoints = array()) {
+    return $this->set('breakpoints',$breakpoints);
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  public function getSource() {
+    return $this->get('source');
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  public function setSource($source = 'user') {
+    return $this->set('source',$source);
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  public function getSourceType() {
+    return $this->get('sourceType');
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  public function setSourceType($sourceType) {
+    return $this->set('sourceType',$sourceType);
+  }
+
+  /**
    * Overrides Drupal\Core\Entity\Entity::save().
    */
   public function save() {
     // Check if everything is valid.
-    if (!$this->isValid()) {
+    if (! $this->isValid()) {
       throw new InvalidBreakpointException('Invalid data detected.');
     }
     if (empty($this->id)) {
-      $this->id = $this->sourceType . '.' . $this->source . '.' . $this->name;
+      $this->setId($this->getSourceType() . '.' . $this->getSource() . '.' . $this->getName());
     }
     // Only save the keys, but return the full objects.
-    $this->breakpoints = array_keys($this->breakpoints);
+    $this->setBreakpoints(array_keys($this->getBreakpoints()));
     parent::save();
     $this->loadAllBreakpoints();
   }
@@ -123,22 +192,28 @@ public function save() {
    */
   public function isValid() {
     // Check for illegal values in breakpoint group source type.
-    if (!in_array($this->sourceType, array(
-        Breakpoint::SOURCE_TYPE_USER_DEFINED,
-        Breakpoint::SOURCE_TYPE_MODULE,
-        Breakpoint::SOURCE_TYPE_THEME)
-      )) {
-      throw new InvalidBreakpointSourceTypeException(format_string('Invalid source type @source_type', array(
-        '@source_type' => $this->sourceType,
+    if (! in_array($this->getSourceType(),array(
+      Breakpoint::SOURCE_TYPE_USER_DEFINED,
+      Breakpoint::SOURCE_TYPE_MODULE,
+      Breakpoint::SOURCE_TYPE_THEME
+    ))) {
+      throw new InvalidBreakpointSourceTypeException(format_string('Invalid source type @source_type',array(
+        '@source_type' => $this->getSourceType()
       )));
     }
     // Check for illegal characters in breakpoint group source.
-    if (preg_match('/[^a-z_]+/', $this->source) || empty($this->source)) {
-      throw new InvalidBreakpointSourceException(format_string("Invalid value '@source' for breakpoint group source property. Breakpoint group source property can only contain lowercase letters and underscores.", array('@source' => $this->source)));
+    $source = $this->getSource();
+    if (preg_match('/[^a-z_]+/',$source) || empty($source)) {
+      throw new InvalidBreakpointSourceException(format_string("Invalid value '@source' for breakpoint group source property. Breakpoint group source property can only contain lowercase letters and underscores.",array(
+        '@source' => $this->getSource()
+      )));
     }
     // Check for illegal characters in breakpoint group name.
-    if (preg_match('/[^a-z0-9_]+/', $this->name || empty($this->name))) {
-      throw new InvalidBreakpointNameException(format_string("Invalid value '@name' for breakpoint group name property. Breakpoint group name property can only contain lowercase letters, numbers and underscores.", array('@name' => $this->name)));
+    $name = $this->getName();
+    if (preg_match('/[^a-z0-9_]+/',$name || empty($name))) {
+      throw new InvalidBreakpointNameException(format_string("Invalid value '@name' for breakpoint group name property. Breakpoint group name property can only contain lowercase letters, numbers and underscores.",array(
+        '@name' => getName()
+      )));
     }
     return TRUE;
   }
@@ -148,37 +223,41 @@ public function isValid() {
    */
   public function addBreakpointFromMediaQuery($name, $media_query) {
     // Use the existing breakpoint if it exists.
-    $breakpoint = entity_load('breakpoint', $this->sourceType . '.' . $this->name . '.' . $name);
-    if (!$breakpoint) {
+    $breakpoint = entity_load('breakpoint',$this->getSourceType() . '.' . $this->getName() . '.' . $name);
+    if (! $breakpoint) {
       // Build a new breakpoint.
-      $breakpoint = entity_create('breakpoint', array(
+      $breakpoint = entity_create('breakpoint',array(
         'name' => $name,
         'label' => $name,
         'mediaQuery' => $media_query,
-        'source' => $this->name,
-        'sourceType' => $this->sourceType,
-        'weight' => count($this->breakpoints),
+        'source' => $this->getName(),
+        'sourceType' => $this->getSourceType(),
+        'weight' => count($this->getBreakpoints())
       ));
       $breakpoint->save();
     }
-    $this->breakpoints[$breakpoint->id()] = $breakpoint;
+    $breakpoints = $this->getBreakpoints();
+    $breakpoints [$breakpoint->id()] = $breakpoint;
+    $this->setBreakpoints($breakpoints);
   }
 
   /**
    * {@inheritdoc}
    */
   public function addBreakpoints($breakpoints) {
-    foreach ($breakpoints as $breakpoint_name) {
+    foreach ( $breakpoints as $breakpoint_name ) {
       // Check if breakpoint exists, assume $breakpoint_name is a machine name.
-      $breakpoint = entity_load('breakpoint', $this->sourceType . '.' . $this->source . '.' . $breakpoint_name);
+      $breakpoint = entity_load('breakpoint',$this->getSourceType() . '.' . $this->getSource() . '.' . $breakpoint_name);
       // If the breakpoint doesn't exist, assume $breakpoint_name is an id.
-      if (!$breakpoint) {
-        $breakpoint = entity_load('breakpoint', $breakpoint_name);
+      if (! $breakpoint) {
+        $breakpoint = entity_load('breakpoint',$breakpoint_name);
       }
       // If the breakpoint doesn't exists, do not add it.
       if ($breakpoint) {
         // Add breakpoint to group.
-        $this->breakpoints[$breakpoint->id()] = $breakpoint;
+        $breakpoints = $this->getBreakpoints();
+        $breakpoints [$breakpoint->id()] = $breakpoint;
+        $this->setBreakpoints($breakpoints);
       }
     }
   }
@@ -187,17 +266,18 @@ public function addBreakpoints($breakpoints) {
    * Loads all breakpoints, remove non-existing ones.
    *
    * @return array
-   *   Array containing breakpoints keyed by their id.
+   * Array containing breakpoints keyed by their id.
    */
   protected function loadAllBreakpoints() {
-    $breakpoints = $this->breakpoints;
-    $this->breakpoints = array();
-    foreach ($breakpoints as $breakpoint_id) {
+    $breakpoints = $this->getBreakpoints();
+    $loaded_breakpoints = array();
+    foreach ( $breakpoints as $breakpoint_id ) {
       $breakpoint = breakpoint_load($breakpoint_id);
       if ($breakpoint) {
-        $this->breakpoints[$breakpoint_id] = $breakpoint;
+        $loaded_breakpoints [$breakpoint_id] = $breakpoint;
       }
     }
+    $this->setBreakpoints($loaded_breakpoints);
   }
 
 }
diff --git a/core/modules/breakpoint/lib/Drupal/breakpoint/Tests/BreakpointGroupAPITest.php b/core/modules/breakpoint/lib/Drupal/breakpoint/Tests/BreakpointGroupAPITest.php
index 3751c81..4bda37d 100644
--- a/core/modules/breakpoint/lib/Drupal/breakpoint/Tests/BreakpointGroupAPITest.php
+++ b/core/modules/breakpoint/lib/Drupal/breakpoint/Tests/BreakpointGroupAPITest.php
@@ -49,9 +49,9 @@ public function testConfigName() {
     $this->assertTrue($exception, 'An exception is thrown when an invalid sourceType is entered.');
 
     // Try an invalid source.
-    $breakpoint_group->name = '';
-    $breakpoint_group->sourceType = Breakpoint::SOURCE_TYPE_USER_DEFINED;
-    $breakpoint_group->source = 'custom*_module source';
+    $breakpoint_group->setName('');
+    $breakpoint_group->setSourceType(Breakpoint::SOURCE_TYPE_USER_DEFINED);
+    $breakpoint_group->setSource('custom*_module source');
 
     $exception = FALSE;
     try {
@@ -63,8 +63,8 @@ public function testConfigName() {
     $this->assertTrue($exception, 'An exception is thrown when an invalid source is entered.');
 
     // Try a valid breakpoint_group.
-    $breakpoint_group->name = 'test';
-    $breakpoint_group->source = 'custom_module_source';
+    $breakpoint_group->setName('test');
+    $breakpoint_group->setSource('custom_module_source');
 
     $exception = FALSE;
     try {
diff --git a/core/modules/breakpoint/lib/Drupal/breakpoint/Tests/BreakpointGroupCRUDTest.php b/core/modules/breakpoint/lib/Drupal/breakpoint/Tests/BreakpointGroupCRUDTest.php
index bd5a2a8..1b7381d 100644
--- a/core/modules/breakpoint/lib/Drupal/breakpoint/Tests/BreakpointGroupCRUDTest.php
+++ b/core/modules/breakpoint/lib/Drupal/breakpoint/Tests/BreakpointGroupCRUDTest.php
@@ -50,7 +50,7 @@ public function testBreakpointGroupCRUD() {
     $this->verifyBreakpointGroup($group);
 
     // Update the breakpoint group.
-    $group->breakpoints = array_keys($breakpoints);
+    $group->setBreakpoints(array_keys($breakpoints));
     $group->save();
     $this->verifyBreakpointGroup($group);
 
diff --git a/core/modules/breakpoint/lib/Drupal/breakpoint/Tests/BreakpointGroupTestBase.php b/core/modules/breakpoint/lib/Drupal/breakpoint/Tests/BreakpointGroupTestBase.php
index 0f7e471..cc9eb0d 100644
--- a/core/modules/breakpoint/lib/Drupal/breakpoint/Tests/BreakpointGroupTestBase.php
+++ b/core/modules/breakpoint/lib/Drupal/breakpoint/Tests/BreakpointGroupTestBase.php
@@ -45,17 +45,17 @@ public function verifyBreakpointGroup(BreakpointGroup $group, BreakpointGroup $c
         '%group' => $group->label(),
         '%property' => $property,
       );
-      if (is_array($compare_set->{$property})) {
-        $this->assertEqual(array_keys($compare_set->{$property}), array_keys($group->{$property}), format_string('breakpoint_group_load: Proper %property for breakpoint group %group.', $t_args), 'Breakpoint API');
+      if (is_array($compare_set->get($property))) {
+        $this->assertEqual(array_keys($compare_set->get($property)), array_keys($group->get($property)), format_string('breakpoint_group_load: Proper %property for breakpoint group %group.', $t_args), 'Breakpoint API');
       }
       else {
         $t_args = array(
           '%group' => $group->label(),
           '%property' => $property,
-          '%property1' => $compare_set->{$property},
-          '%property2' => $group->{$property},
+          '%property1' => $compare_set->get($property),
+          '%property2' => $group->get($property),
         );
-        $this->assertEqual($compare_set->{$property}, $group->{$property}, format_string('breakpoint_group_load: Proper %property: %property1 == %property2 for breakpoint group %group.', $t_args), 'Breakpoint API');
+        $this->assertEqual($compare_set->get($property), $group->get($property), format_string('breakpoint_group_load: Proper %property: %property1 == %property2 for breakpoint group %group.', $t_args), 'Breakpoint API');
       }
     }
   }
diff --git a/core/modules/breakpoint/lib/Drupal/breakpoint/Tests/BreakpointThemeTest.php b/core/modules/breakpoint/lib/Drupal/breakpoint/Tests/BreakpointThemeTest.php
index e00af05..f5242b9 100644
--- a/core/modules/breakpoint/lib/Drupal/breakpoint/Tests/BreakpointThemeTest.php
+++ b/core/modules/breakpoint/lib/Drupal/breakpoint/Tests/BreakpointThemeTest.php
@@ -45,14 +45,14 @@ public function testThemeBreakpoints() {
       'name' => 'breakpoint_test_theme',
       'source' => 'breakpoint_test_theme',
       'sourceType' => Breakpoint::SOURCE_TYPE_THEME,
-      'id' => Breakpoint::SOURCE_TYPE_THEME . '.breakpoint_test_theme.breakpoint_test_theme',
-    ));
-    $breakpoint_group_obj->breakpoints = array(
+      'id' => Breakpoint::SOURCE_TYPE_THEME . '.breakpoint_test_theme.breakpoint_test_theme'
+    ) );
+    $breakpoint_group_obj->setBreakpoints( array(
       'theme.breakpoint_test_theme.mobile' => array(),
       'theme.breakpoint_test_theme.narrow' => array(),
       'theme.breakpoint_test_theme.wide' => array(),
       'theme.breakpoint_test_theme.tv' => array(),
-    );
+    ));
 
     // Verify we can load this breakpoint defined by the theme.
     $this->verifyBreakpointGroup($breakpoint_group_obj);
@@ -74,11 +74,11 @@ public function testThemeBreakpointGroup() {
       'source' => 'breakpoint_test_theme',
       'id' => Breakpoint::SOURCE_TYPE_THEME . '.breakpoint_test_theme.test',
     ));
-    $breakpoint_group_obj->breakpoints = array(
+    $breakpoint_group_obj->setBreakpoints(array(
       'theme.breakpoint_test_theme.mobile' => array('1.5x', '2.x'),
       'theme.breakpoint_test_theme.narrow' => array(),
       'theme.breakpoint_test_theme.wide' => array(),
-    );
+    ));
 
     // Verify we can load this breakpoint defined by the theme.
     $this->verifyBreakpointGroup($breakpoint_group_obj);
@@ -105,11 +105,11 @@ public function testThemeBreakpointGroupModule() {
       'source' => 'breakpoint_theme_test',
       'id' => Breakpoint::SOURCE_TYPE_MODULE . '.breakpoint_theme_test.module_test',
     ));
-    $breakpoint_group_obj->breakpoints = array(
+    $breakpoint_group_obj->setBreakpoints(array(
       'theme.breakpoint_test_theme.mobile' => array(),
       'theme.breakpoint_test_theme.narrow' => array(),
       'theme.breakpoint_test_theme.wide' => array(),
-    );
+    ));
 
     // Verify we can load this breakpoint defined by the theme.
     $this->verifyBreakpointGroup($breakpoint_group_obj);
diff --git a/core/modules/toolbar/toolbar.module b/core/modules/toolbar/toolbar.module
index 85bfafa..45610c1 100644
--- a/core/modules/toolbar/toolbar.module
+++ b/core/modules/toolbar/toolbar.module
@@ -192,7 +192,7 @@ function toolbar_pre_render($element) {
       function ($object) {
         return $object->mediaQuery;
       },
-      $breakpoints->breakpoints
+      $breakpoints->getBreakpoints()
     );
 
     $element['#attached']['js'][] = array(