diff -u b/core/modules/breakpoint/breakpoint.module b/core/modules/breakpoint/breakpoint.module
--- b/core/modules/breakpoint/breakpoint.module
+++ b/core/modules/breakpoint/breakpoint.module
@@ -144,12 +144,11 @@
     $breakpoint_group = entity_load('breakpoint_group', $source_type . '.' . $id);
     if (!$breakpoint_group) {
       // Build a new breakpoint group.
-      $breakpoint_group = entity_create('breakpoint_group', array(
-        'id' => $id,
-        'label' => $label,
-        'source' => $id,
-        'sourceType' => $source_type,
-      ));
+      $breakpoint_group = new BreakpointGroup();
+      $breakpoint_group->id = $id;
+      $breakpoint_group->label = $label;
+      $breakpoint_group->source = $id;
+      $breakpoint_group->sourceType = $source_type;
     }
     else {
       // Reset label.
@@ -160,14 +159,14 @@
       $breakpoint = entity_load('breakpoint', $source_type . '.' . $id . '.' . $name);
       if (!$breakpoint) {
         // Build a new breakpoint.
-        $breakpoint = entity_create('breakpoint', array(
-          'name' => $name,
-          'label' => drupal_ucfirst($name),
-          'mediaQuery' => $media_query,
-          'source' => $id,
-          'sourceType' => $source_type,
-          'weight' => $weight++,
-        ));
+        $breakpoint = new Breakpoint;
+        $breakpoint->name = $name;
+        $breakpoint->label = drupal_ucfirst($name);
+        $breakpoint->mediaQuery = $media_query;
+        $breakpoint->source = $id;
+        $breakpoint->sourceType = $source_type;
+        $breakpoint->status = TRUE;
+        $breakpoint->weight = $weight++;
         $breakpoint->save();
       }
       else {
@@ -203,16 +202,25 @@
         // Use the existing breakpoint group if it exists.
         $breakpoint_group = entity_load('breakpoint_group', $source_type . '.' . $id);
         if (!$breakpoint_group) {
-          $breakpoint_group = entity_create('breakpoint_group', array(
-            'id' => $id,
-            'label' => isset($data['label']) ? $data['label'] : drupal_ucfirst($data[$id]),
-            'source' => $group_id,
-            'sourceType' => $source_type,
-          ));
+          $breakpoint_group = new BreakpointGroup();
+          $breakpoint_group->sourceType = $source_type;
+          $breakpoint_group->source = $group_id;
+          $breakpoint_group->id = $id;
+          if (isset($data['label']) && !empty($data['label'])) {
+            $breakpoint_group->label = $data['label'];
+          }
+          else {
+            $breakpoint_group->label = drupal_ucfirst($data['label']);
+          }
         }
         else {
           // Reset label.
-          $breakpoint_group->label = isset($data['label']) ? $data['label'] : drupal_ucfirst($data[$id]);
+          if (isset($data['label']) && !empty($data['label'])) {
+            $breakpoint_group->label = $data['label'];
+          }
+          else {
+            $breakpoint_group->label = drupal_ucfirst($data['label']);
+          }
         }
         foreach ($data['breakpoints'] as $breakpoint_id => $multipliers) {
           // Check if breakpoint exists, assume short name.
diff -u b/core/modules/breakpoint/lib/Drupal/breakpoint/Breakpoint.php b/core/modules/breakpoint/lib/Drupal/breakpoint/Breakpoint.php
--- b/core/modules/breakpoint/lib/Drupal/breakpoint/Breakpoint.php
+++ b/core/modules/breakpoint/lib/Drupal/breakpoint/Breakpoint.php
@@ -222,9 +222,9 @@
    *
    */
   public function duplicate() {
-    return entity_create('breakpoint', array(
-      'mediaQuery' => $this->mediaQuery,
-    ));
+    $duplicate = new Breakpoint;
+    $duplicate->mediaQuery = $this->mediaQuery;
+    return $duplicate;
   }
 
   /**
diff -u b/core/modules/breakpoint/lib/Drupal/breakpoint/BreakpointGroup.php b/core/modules/breakpoint/lib/Drupal/breakpoint/BreakpointGroup.php
--- b/core/modules/breakpoint/lib/Drupal/breakpoint/BreakpointGroup.php
+++ b/core/modules/breakpoint/lib/Drupal/breakpoint/BreakpointGroup.php
@@ -143,9 +143,9 @@
    *
    */
   public function duplicate() {
-    return entity_create('breakpoint_group', array(
-      'breakpoints' => $this->breakpoints,
-    ));
+    $duplicate = new BreakpointGroup;
+    $duplicate->breakpoints = $this->breakpoints;
+    return $duplicate;
   }
 
   /**
diff -u b/core/modules/breakpoint/lib/Drupal/breakpoint/Tests/BreakpointApiTest.php b/core/modules/breakpoint/lib/Drupal/breakpoint/Tests/BreakpointApiTest.php
--- b/core/modules/breakpoint/lib/Drupal/breakpoint/Tests/BreakpointApiTest.php
+++ b/core/modules/breakpoint/lib/Drupal/breakpoint/Tests/BreakpointApiTest.php
@@ -30,12 +30,14 @@
    * Test Breakpoint::buildConfigName().
    */
   public function testConfigName() {
-    $breakpoint = entity_create('breakpoint', array(
-      'label' => drupal_strtolower($this->randomName()),
-      'source' => 'custom_module',
-      // Try an invalid sourceType.
-      'sourceType' => 'oops',
-    ));
+    $breakpoint = new Breakpoint(
+      array(
+        'label' => drupal_strtolower($this->randomName()),
+        'source' => 'custom_module',
+        // Try an invalid sourceType.
+        'sourceType' => 'oops',
+      )
+    );
 
     try {
       $breakpoint->save();
diff -u b/core/modules/breakpoint/lib/Drupal/breakpoint/Tests/BreakpointCrudTest.php b/core/modules/breakpoint/lib/Drupal/breakpoint/Tests/BreakpointCrudTest.php
--- b/core/modules/breakpoint/lib/Drupal/breakpoint/Tests/BreakpointCrudTest.php
+++ b/core/modules/breakpoint/lib/Drupal/breakpoint/Tests/BreakpointCrudTest.php
@@ -30,10 +30,12 @@
    */
   public function testBreakpointCrud() {
     // Add a breakpoint with minimum data only.
-    $breakpoint = entity_create('breakpoint', array(
+    $values = array(
       'label' => drupal_strtolower($this->randomName()),
       'mediaQuery' => '(min-width: 600px)',
-    ));
+    );
+
+    $breakpoint = new Breakpoint($values);
     $breakpoint->save();
 
     $this->verifyBreakpoint($breakpoint);
diff -u b/core/modules/breakpoint/lib/Drupal/breakpoint/Tests/BreakpointGroupCrudTest.php b/core/modules/breakpoint/lib/Drupal/breakpoint/Tests/BreakpointGroupCrudTest.php
--- b/core/modules/breakpoint/lib/Drupal/breakpoint/Tests/BreakpointGroupCrudTest.php
+++ b/core/modules/breakpoint/lib/Drupal/breakpoint/Tests/BreakpointGroupCrudTest.php
@@ -34,21 +34,23 @@
     $breakpoints = array();
     for ($i = 0; $i <= 3; $i++) {
       $width = ($i + 1) * 200;
-      $breakpoint = entity_create('breakpoint', array(
+      $values = array(
         'name' => drupal_strtolower($this->randomName()),
         'weight' => $i,
         'mediaQuery' => "(min-width: {$width}px)",
-      ));
+      );
+      $breakpoint = new Breakpoint($values);
       $breakpoint->save();
       $breakpoints[$breakpoint->id()] = $breakpoint;
     }
     // Add a breakpoint group with minimum data only.
     $label = $this->randomName();
-
-    $group = entity_create('breakpoint_group', array(
+    $values = array(
       'label' => $label,
       'id' => drupal_strtolower($label),
-    ));
+    );
+
+    $group = new BreakpointGroup($values);
     $group->save();
     $this->verifyBreakpointGroup($group);
 
@@ -58,9 +60,8 @@
     $this->verifyBreakpointGroup($group);
 
     // Duplicate the breakpoint group.
-    $new_set = entity_create('breakpoint_group', array(
-      'breakpoints' => $group->breakpoints,
-    ));
+    $new_set = new BreakpointGroup();
+    $new_set->breakpoints = $group->breakpoints;
     $duplicated_set = $group->duplicate();
     $this->verifyBreakpointGroup($duplicated_set, $new_set);
 
diff -u b/core/modules/breakpoint/lib/Drupal/breakpoint/Tests/BreakpointThemeTest.php b/core/modules/breakpoint/lib/Drupal/breakpoint/Tests/BreakpointThemeTest.php
--- b/core/modules/breakpoint/lib/Drupal/breakpoint/Tests/BreakpointThemeTest.php
+++ b/core/modules/breakpoint/lib/Drupal/breakpoint/Tests/BreakpointThemeTest.php
@@ -46,18 +46,17 @@
    */
   public function testThemeBreakpoints() {
     // Verify the breakpoint group for breakpoint_test_theme was created.
-    $breakpoint_group_obj = entity_create('breakpoint_group', array(
-      'label' => 'Breakpoint test theme',
-      'id' => 'breakpoint_test_theme',
-      'sourceType' => Breakpoint::SOURCE_TYPE_THEME,
-      'overridden' => FALSE,
-    ));
+    $breakpoint_group_obj = new BreakpointGroup();
+    $breakpoint_group_obj->label = 'Breakpoint test theme';
+    $breakpoint_group_obj->id = 'breakpoint_test_theme';
+    $breakpoint_group_obj->sourceType = Breakpoint::SOURCE_TYPE_THEME;
     $breakpoint_group_obj->breakpoints = 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(),
     );
+    $breakpoint_group_obj->overridden = 0;
 
     // Verify we can load this breakpoint defined by the theme.
     $this->verifyBreakpointGroup($breakpoint_group_obj);
@@ -94,18 +93,17 @@
    */
   public function testThemeBreakpointGroup() {
     // Verify the breakpoint group 'test' was created by breakpoint_test_theme.
-    $breakpoint_group_obj = entity_create('breakpoint_group', array(
-      'label' => 'Test',
-      'id' => 'test',
-      'sourceType' => Breakpoint::SOURCE_TYPE_THEME,
-      'source' => 'breakpoint_test_theme',
-      'overridden' => FALSE,
-    ));
+    $breakpoint_group_obj = new BreakpointGroup();
+    $breakpoint_group_obj->label = 'Test';
+    $breakpoint_group_obj->id = 'test';
+    $breakpoint_group_obj->sourceType = Breakpoint::SOURCE_TYPE_THEME;
+    $breakpoint_group_obj->source = 'breakpoint_test_theme';
     $breakpoint_group_obj->breakpoints = array(
       'theme.breakpoint_test_theme.mobile' => array('1.5x', '2.x'),
       'theme.breakpoint_test_theme.narrow' => array(),
       'theme.breakpoint_test_theme.wide' => array(),
     );
+    $breakpoint_group_obj->overridden = 0;
 
     // Verify we can load this breakpoint defined by the theme.
     $this->verifyBreakpointGroup($breakpoint_group_obj);
@@ -125,18 +123,17 @@
 
     // Verify the breakpoint group 'module_test' was created by
     // breakpoint_theme_test module.
-    $breakpoint_group_obj = entity_create('breakpoint_group', array(
-      'label' => 'Test Module',
-      'id' => 'module_test',
-      'sourceType' => Breakpoint::SOURCE_TYPE_MODULE,
-      'source' => 'breakpoint_theme_test',
-      'overridden' => FALSE,
-    ));
+    $breakpoint_group_obj = new BreakpointGroup();
+    $breakpoint_group_obj->label = 'Test Module';
+    $breakpoint_group_obj->id = 'module_test';
+    $breakpoint_group_obj->sourceType = Breakpoint::SOURCE_TYPE_MODULE;
+    $breakpoint_group_obj->source = 'breakpoint_theme_test';
     $breakpoint_group_obj->breakpoints = array(
       'theme.breakpoint_test_theme.mobile' => array(),
       'theme.breakpoint_test_theme.narrow' => array('3.x', '4.x'),
       'theme.breakpoint_test_theme.wide' => array(),
     );
+    $breakpoint_group_obj->overridden = 0;
 
     // Verify we can load this breakpoint defined by the theme.
     $this->verifyBreakpointGroup($breakpoint_group_obj);