diff --git a/core/modules/breakpoint/breakpoint.module b/core/modules/breakpoint/breakpoint.module
index 3c9657c..1c1324f 100644
--- a/core/modules/breakpoint/breakpoint.module
+++ b/core/modules/breakpoint/breakpoint.module
@@ -37,7 +37,7 @@ function breakpoint_help($route_name, RouteMatchInterface $route_match) {
 }
 
 /**
- * Load all breakpoint groups as select options.
+ * Loads all breakpoint groups as select options.
  *
  * @return array
  *   An array containing breakpoint group labels indexed by their ids.
@@ -46,7 +46,7 @@ function breakpoint_group_select_options() {
   $modules = \Drupal::moduleHandler()->getModuleList();
   $options = array();
   foreach ($modules as $module) {
-    $group_id = $module->getType() . '.' . $module->getName() . '.breakpointgroup';
+    $group_id = breakpoint_breakpoint_group_id($module);
     $breakpoint_group = \Drupal::state()->get($group_id);
     if ($breakpoint_group) {
       $options[$group_id] = $breakpoint_group['label'];
@@ -54,7 +54,7 @@ function breakpoint_group_select_options() {
   }
   $themes = \Drupal::service('theme_handler')->listInfo();
   foreach ($themes as $theme) {
-    $group_id = $theme->getType() . '.' . $theme->getName() . '.breakpointgroup';
+    $group_id = breakpoint_breakpoint_group_id($theme);
     $breakpoint_group = \Drupal::state()->get($group_id);
     if ($breakpoint_group) {
       $options[$group_id] = $breakpoint_group['label'];
@@ -65,7 +65,7 @@ function breakpoint_group_select_options() {
 }
 
 /**
- * Load all breakpoints as select options.
+ * Loads all breakpoints as select options.
  *
  * @return array
  *   An array containing breakpoints indexed by their ids.
@@ -74,7 +74,7 @@ function breakpoint_select_options() {
   $modules = \Drupal::moduleHandler()->getModuleList();
   $options = array();
   foreach ($modules as $module) {
-    $breakpoint_group = \Drupal::state()->get($module->getType() . '.' . $module->getName() . '.breakpointgroup');
+    $breakpoint_group = \Drupal::state()->get(breakpoint_breakpoint_group_id($module));
     if ($breakpoint_group) {
       foreach ($breakpoint_group['breakpoints'] as $breakpoint) {
         $options[$breakpoint['name']] = $breakpoint['label'] . ' (' . $module->info['name'] . ' - ' . $module->getType() . ') [' . $breakpoint['mediaQuery'] . ']';
@@ -83,7 +83,7 @@ function breakpoint_select_options() {
   }
   $themes = \Drupal::service('theme_handler')->listInfo();
   foreach ($themes as $theme) {
-    $breakpoint_group = \Drupal::state()->get($theme->getType() . '.' . $theme->getName() . '.breakpointgroup');
+    $breakpoint_group = \Drupal::state()->get(breakpoint_breakpoint_group_id($theme));
     if ($breakpoint_group) {
       foreach ($breakpoint_group['breakpoints'] as $breakpoint) {
         $options[$breakpoint['name']] = $breakpoint['label'] . ' (' . $theme->info['name'] . ' - ' . $theme->getType() . ') [' . $breakpoint['mediaQuery'] . ']';
@@ -135,7 +135,7 @@ function breakpoint_themes_disabled($theme_list) {
 }
 
 /**
- * Save breakpoints from an extension (module or theme).
+ * Saves breakpoints from an extension (module or theme).
  *
  * @param \Drupal\Core\Extension\Extension $extension
  *   The extension (module or theme) to save breakpoints from.
@@ -149,7 +149,7 @@ function breakpoint_save_extension_breakpoints(\Drupal\Core\Extension\Extension
     uasort($breakpoints, array('Drupal\Component\Utility\SortArray', 'sortByWeightElement'));
     $breakpoint_group = array(
       'label' => $extension->info['name'],
-      'id' => $extension->getType() . '.' . $extension->getName() . '.breakpointgroup',
+      'id' => breakpoint_breakpoint_group_id($extension),
       'breakpoints' => $breakpoints,
     );
     $action = \Drupal::state()->get($breakpoint_group['id']) ? 'update' : 'insert';
@@ -159,19 +159,19 @@ function breakpoint_save_extension_breakpoints(\Drupal\Core\Extension\Extension
 }
 
 /**
- * Delete breakpoints from an extension (module or theme).
+ * Deletes breakpoints from an extension (module or theme).
  *
  * @param \Drupal\Core\Extension\Extension $extension
  *   The extension (module or theme) to delete breakpoints from.
  */
 function breakpoint_delete_extension_breakpoints(\Drupal\Core\Extension\Extension $extension) {
-  $breakpoint_group = breakpoint_load_breakpoint_group($extension->getType() . '.' . $extension->getName() . '.breakpointgroup');
+  $breakpoint_group = breakpoint_load_breakpoint_group(breakpoint_breakpoint_group_id($extension));
   \Drupal::state()->delete($breakpoint_group['id']);
   \Drupal::moduleHandler()->invokeAll('breakpoint_group_delete', array($breakpoint_group));
 }
 
 /**
- * Load a breakpoint group.
+ * Loads a breakpoint group.
  *
  * @param string $breakpoint_group_id
  *   The breakpoint group id.
@@ -204,7 +204,7 @@ function breakpoint_rebuild() {
 }
 
 /**
- * Read breakpoint groups from all extensions.
+ * Reads breakpoint groups from all extensions.
  */
 function breakpoint_read_breakpoint_groups() {
   $modules = system_rebuild_module_data();
@@ -218,7 +218,7 @@ function breakpoint_read_breakpoint_groups() {
 }
 
 /**
- * Remove all breakpoint groups.
+ * Removes all breakpoint groups.
  */
 function breakpoint_remove_breakpoint_groups() {
   $modules = system_rebuild_module_data();
@@ -230,3 +230,13 @@ function breakpoint_remove_breakpoint_groups() {
     breakpoint_delete_extension_breakpoints($theme);
   }
 }
+
+/**
+ * Returns the id of the breakpoint group of the given module or theme.
+ *
+ * @param \Drupal\Core\Extension\Extension $extension
+ *   The extension (module or theme) to get the breakpoint group id for.
+ */
+function breakpoint_breakpoint_group_id(\Drupal\Core\Extension\Extension $extension) {
+  return $extension->getType() . '.' . $extension->getName() . '.breakpointgroup';
+}