Major commit

Renamed project to Heartbeat
HeartbeatType now requires you to set the primary Entity Type

config/schema/heartbeat.schema.yml

@@ -1,4 +1,4 @@
-heartbeat8.heartbeat_type.*:
+heartbeat.heartbeat_type.*:
   type: config_entity
   label: 'Heartbeat type config'
   mapping:

config/schema/heartbeat_stream.schema.yml.bak

@@ -1,36 +0,0 @@
-heartbeat8.heartbeat_stream.*:
-  type: content_entity
-  label: 'Heartbeat stream config'
-  mapping:
-    id:
-      type: string
-      label: 'ID'
-    label:
-      type: label
-      label: 'Label'
-    uuid:
-      type: string
-    class:
-      type: string
-      label: 'class'
-    real_class:
-      type: string
-      label: 'real class'
-    name:
-      type: string
-      label: 'name'
-    module:
-      type: string
-      label: 'module'
-    title:
-      type: string
-      label: 'string'
-    path:
-      type: string
-      label: 'path'
-    settings:
-      type: blob
-      label: 'settings'
-    variables:
-      type: blob
-      label: 'variables'

config/schema/heartbeat_type.schema.yml.bak

@@ -1,42 +0,0 @@
-heartbeat8.heartbeat_type.*:
-  type: config_entity
-  label: 'Heartbeat type config'
-  mapping:
-    id:
-      type: string
-      label: 'ID'
-    label:
-      type: label
-      label: 'Label'
-    uuid:
-      type: string
-    hid:
-      type: serial
-      label: 'hid'
-    message_id:
-      type: string
-      label: 'message_id'
-    description:
-      type: string
-      label: 'description'
-    message:
-      type: string
-      label: 'message'
-    message_concat:
-      type: string
-      label: 'message_concat'
-    perms:
-      type: integer
-      label: 'perms'
-    group_type:
-      type: string
-      label: 'group_type'
-    concat_args:
-      type: blob
-      label: 'concat_args'
-    variables:
-      type: blob
-      label: 'variables'
-    attachments:
-      type: blob
-      label: 'attachments'

heartbeat8.info.yml → heartbeat.info.yml

@@ -1,4 +1,4 @@
-name: heartbeat8
+name: heartbeat
 type: module
 description: Heartbeat for Drupal 8
 core: 8.x

heartbeat8.install → heartbeat.install

@@ -11,7 +11,7 @@ use Drupal\user\RoleInterface;
 /**
  * Implements hook_requirements().
  */
-function heartbeat8_requirements($phase) {
+function heartbeat_requirements($phase) {
   $requirements = array();
   if ($phase === 'runtime') {
     // Only show rebuild button if there are either 0, or 2 or more, rows
@@ -40,7 +40,7 @@ function heartbeat8_requirements($phase) {
  * Implements hook_schema().
  * ** //TODO Have not yet set export schema for CTOOLS as CTOOLS is not yet a part of Drupal 8
  */
-function heartbeat8_schema() {
+function heartbeat_schema() {
   $schema['heartbeat_messages'] = array(
     'description' => 'Table that contains predefined messages that can be used in heartbeat views.',
     'fields' => array(

heartbeat8.libraries.yml → heartbeat.libraries.yml

@@ -2,4 +2,4 @@ treeTable:
   version: 1.x
   css:
     theme:
-      css/heartbeat8.css: {}
+      css/heartbeat.css: {}

heartbeat8.module → heartbeat.module

@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Contains heartbeat8.module.
+ * Contains heartbeat.module.
  */
 
 
@@ -11,19 +11,19 @@ use Drupal\Core\Entity\EntityInterface;
 use Drupal\node\NodeInterface;
 use Drupal\Core\Session\AccountInterface;
 use Drupal\Core\Entity;
-use Drupal\heartbeat8\Entity\FILE_FIELD;
-use Drupal\heartbeat8\Entity\Heartbeat;
-use Drupal\heartbeat8\Entity\HeartbeatType;
+use Drupal\heartbeat\Entity\FILE_FIELD;
+use Drupal\heartbeat\Entity\Heartbeat;
+use Drupal\heartbeat\Entity\HeartbeatType;
 
 
 
 /**
  * Implements hook_help().
  */
-function heartbeat8_help($route_name, RouteMatchInterface $route_match) {
+function heartbeat_help($route_name, RouteMatchInterface $route_match) {
   switch ($route_name) {
-    // Main module help for the heartbeat8 module.
-    case 'help.page.heartbeat8':
+    // Main module help for the heartbeat module.
+    case 'help.page.heartbeat':
       $output = '';
       $output .= '<h3>' . t('About') . '</h3>';
       $output .= '<p>' . t('Heartbeat for Drupal 8') . '</p>';
@@ -37,7 +37,7 @@ function heartbeat8_help($route_name, RouteMatchInterface $route_match) {
 /**
  * Implements hook_theme().
  */
-function heartbeat8_theme() {
+function heartbeat_theme() {
   $theme = [];
   $theme['heartbeat'] = array(
     'render element' => 'elements',
@@ -55,7 +55,7 @@ function heartbeat8_theme() {
 /**
  * Implements hook_theme_suggestions_HOOK().
  */
-function heartbeat8_theme_suggestions_heartbeat(array $variables) {
+function heartbeat_theme_suggestions_heartbeat(array $variables) {
   $suggestions = array();
   $entity = $variables['elements']['#heartbeat'];
   $sanitized_view_mode = strtr($variables['elements']['#view_mode'], '.', '_');
@@ -71,7 +71,7 @@ function heartbeat8_theme_suggestions_heartbeat(array $variables) {
 /**
  * Implements hook_entity_insert().
  */
-function heartbeat8_entity_insert(EntityInterface $entity) {
+function heartbeat_entity_insert(EntityInterface $entity) {
 
 if ($entity instanceof \Drupal\node\Entity\Node) {
 
@@ -94,7 +94,7 @@ if ($entity instanceof \Drupal\node\Entity\Node) {
 
   if ($nid) {
 
-    $heartbeatTypeService = \Drupal::service('heartbeat8.heartbeattype');
+    $heartbeatTypeService = \Drupal::service('heartbeat.heartbeattype');
 
     foreach ($heartbeatTypeService->getTypes() as $type) {
 
@@ -116,7 +116,7 @@ if ($entity instanceof \Drupal\node\Entity\Node) {
 
 }
 
-function heartbeat8_node_presave(NodeInterface $node) {
+function heartbeat_node_presave(NodeInterface $node) {
   $uid = $node->getOwnerId();
   $stuffTOdo = null;
 }

heartbeat8.routing.yml → heartbeat.routing.yml

@@ -2,16 +2,16 @@
 # In order to to create pages it is necessary to define routes for them.
 # A route maps a URL path to a controller. It defines what function
 # or method will be called when a URL is accessed.
-# If the user accesses http://drupal8.dev//heartbeat8/test/{arg}, the routing
+# If the user accesses http://drupal8.dev//heartbeat/test/{arg}, the routing
 # system will look for a route with that path. In this case it will find a
 # match, and execute the _controller callback. In this case the callback is
 # defined as a classname
-# ("\Drupal\heartbeat8\Controller\TestController")
+# ("\Drupal\heartbeat\Controller\TestController")
 # and a method ("start").
-heartbeat8.test_controller_start:
-  path: '/heartbeat8/test/{arg}'
+heartbeat.test_controller_start:
+  path: '/heartbeat/test/{arg}'
   defaults:
-    _controller: '\Drupal\heartbeat8\Controller\TestController::start'
+    _controller: '\Drupal\heartbeat\Controller\TestController::start'
     _title: 'run'
   requirements:
     _permission: 'access content'

heartbeat8.services.yml → heartbeat.services.yml

@@ -1,13 +1,13 @@
 services:
-  heartbeat8.heartbeattype:
-    class: Drupal\heartbeat8\HeartbeatTypeServices
+  heartbeat.heartbeattype:
+    class: Drupal\heartbeat\HeartbeatTypeServices
     arguments: ['@entity_type.manager', '@entity.query']
 
   heartbeatstream:
-    class: Drupal\heartbeat8\HeartbeatStreamServices
+    class: Drupal\heartbeat\HeartbeatStreamServices
     arguments: ["@entity_type.manager", "@entity_type.repository", '@entity.query']
 
   heartbeatstreamalt:
-    class: Drupal\heartbeat8\HeartbeatAltServices
-    arguments: ['@entity.query', '@entity.manager', '@entity_type.manager', '@entity_type.repository', '@heartbeat8.heartbeattype']
+    class: Drupal\heartbeat\HeartbeatAltServices
+    arguments: ['@entity.query', '@entity.manager', '@entity_type.manager', '@entity_type.repository', '@heartbeat.heartbeattype']
 

src/Controller/HeartbeatController.php

@@ -1,19 +1,19 @@
 <?php
 
-namespace Drupal\heartbeat8\Controller;
+namespace Drupal\heartbeat\Controller;
 
 use Drupal\Component\Utility\Xss;
 use Drupal\Core\Controller\ControllerBase;
 use Drupal\Core\DependencyInjection\ContainerInjectionInterface;
 use Drupal\Core\Url;
-use Drupal\heartbeat8\Entity\HeartbeatInterface;
+use Drupal\heartbeat\Entity\HeartbeatInterface;
 
 /**
  * Class HeartbeatController.
  *
  *  Returns responses for Heartbeat routes.
  *
- * @package Drupal\heartbeat8\Controller
+ * @package Drupal\heartbeat\Controller
  */
 class HeartbeatController extends ControllerBase implements ContainerInjectionInterface {
 
@@ -50,7 +50,7 @@ class HeartbeatController extends ControllerBase implements ContainerInjectionIn
   /**
    * Generates an overview table of older revisions of a Heartbeat .
    *
-   * @param \Drupal\heartbeat8\Entity\HeartbeatInterface $heartbeat
+   * @param \Drupal\heartbeat\Entity\HeartbeatInterface $heartbeat
    *   A Heartbeat  object.
    *
    * @return array
@@ -77,7 +77,7 @@ class HeartbeatController extends ControllerBase implements ContainerInjectionIn
     $latest_revision = TRUE;
 
     foreach (array_reverse($vids) as $vid) {
-      /** @var \Drupal\heartbeat8\HeartbeatInterface $revision */
+      /** @var \Drupal\heartbeat\HeartbeatInterface $revision */
       $revision = $heartbeat_storage->loadRevision($vid);
       // Only show revisions that are affected by the language that is being
       // displayed.

src/Controller/HeartbeatStreamController.php

@@ -1,19 +1,19 @@
 <?php
 
-namespace Drupal\heartbeat8\Controller;
+namespace Drupal\heartbeat\Controller;
 
 use Drupal\Component\Utility\Xss;
 use Drupal\Core\Controller\ControllerBase;
 use Drupal\Core\DependencyInjection\ContainerInjectionInterface;
 use Drupal\Core\Url;
-use Drupal\heartbeat8\Entity\HeartbeatStreamInterface;
+use Drupal\heartbeat\Entity\HeartbeatStreamInterface;
 
 /**
  * Class HeartbeatStreamController.
  *
  *  Returns responses for Heartbeat stream routes.
  *
- * @package Drupal\heartbeat8\Controller
+ * @package Drupal\heartbeat\Controller
  */
 class HeartbeatStreamController extends ControllerBase implements ContainerInjectionInterface {
 
@@ -50,7 +50,7 @@ class HeartbeatStreamController extends ControllerBase implements ContainerInjec
   /**
    * Generates an overview table of older revisions of a Heartbeat stream .
    *
-   * @param \Drupal\heartbeat8\Entity\HeartbeatStreamInterface $heartbeat_stream
+   * @param \Drupal\heartbeat\Entity\HeartbeatStreamInterface $heartbeat_stream
    *   A Heartbeat stream  object.
    *
    * @return array
@@ -77,7 +77,7 @@ class HeartbeatStreamController extends ControllerBase implements ContainerInjec
     $latest_revision = TRUE;
 
     foreach (array_reverse($vids) as $vid) {
-      /** @var \Drupal\heartbeat8\HeartbeatStreamInterface $revision */
+      /** @var \Drupal\heartbeat\HeartbeatStreamInterface $revision */
       $revision = $heartbeat_stream_storage->loadRevision($vid);
       // Only show revisions that are affected by the language that is being
       // displayed.

src/Controller/TestController.php

@@ -1,28 +1,28 @@
 <?php
 
-namespace Drupal\heartbeat8\Controller;
+namespace Drupal\heartbeat\Controller;
 
 use Drupal\Core\Controller\ControllerBase;
 use Symfony\Component\DependencyInjection\ContainerInterface;
-use Drupal\heartbeat8\HeartbeatTypeServices;
-use Drupal\heartbeat8\HeartbeatStreamServices;
+use Drupal\heartbeat\HeartbeatTypeServices;
+use Drupal\heartbeat\HeartbeatStreamServices;
 
 /**
  * Class TestController.
  *
- * @package Drupal\heartbeat8\Controller
+ * @package Drupal\heartbeat\Controller
  */
 class TestController extends ControllerBase {
 
   /**
-   * Drupal\heartbeat8\HeartbeatTypeServices definition.
+   * Drupal\heartbeat\HeartbeatTypeServices definition.
    *
    * @var HeartbeatTypeServices
    */
-  protected $heartbeat8_heartbeattype;
+  protected $heartbeat_heartbeattype;
 
   /**
-   * Drupal\heartbeat8\HeartbeatStreamServices definition.
+   * Drupal\heartbeat\HeartbeatStreamServices definition.
    *
    * @var HeartbeatStreamServices
    */
@@ -30,8 +30,8 @@ class TestController extends ControllerBase {
   /**
    * {@inheritdoc}
    */
-  public function __construct(HeartbeatTypeServices $heartbeat8_heartbeattype, HeartbeatStreamServices $heartbeatstream) {
-    $this->heartbeat8_heartbeattype = $heartbeat8_heartbeattype;
+  public function __construct(HeartbeatTypeServices $heartbeat_heartbeattype, HeartbeatStreamServices $heartbeatstream) {
+    $this->heartbeat_heartbeattype = $heartbeat_heartbeattype;
     $this->heartbeatstream = $heartbeatstream;
   }
 
@@ -40,7 +40,7 @@ class TestController extends ControllerBase {
    */
   public static function create(ContainerInterface $container) {
     return new static(
-      $container->get('heartbeat8.heartbeattype'),
+      $container->get('heartbeat.heartbeattype'),
       $container->get('heartbeatstream')
     );
   }
@@ -69,7 +69,7 @@ class TestController extends ControllerBase {
       }
     }
 
-    $heartbeatTypeService = \Drupal::service('heartbeat8.heartbeattype');
+    $heartbeatTypeService = \Drupal::service('heartbeat.heartbeattype');
     foreach ($heartbeatTypeService->getTypes() as $type) {
       $heartbeatTypeEntity = \Drupal::entityTypeManager()->getStorage('heartbeat_type')->load($type);
     }

src/Entity/Heartbeat.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace Drupal\heartbeat8\Entity;
+namespace Drupal\heartbeat\Entity;
 
 use Drupal\Core\Entity\EntityStorageInterface;
 use Drupal\Core\Field\BaseFieldDefinition;
@@ -12,28 +12,28 @@ use Drupal\user\UserInterface;
 /**
  * Defines the Heartbeat entity.
  *
- * @ingroup heartbeat8
+ * @ingroup heartbeat
  *
  * @ContentEntityType(
  *   id = "heartbeat",
  *   label = @Translation("Heartbeat"),
  *   bundle_label = @Translation("Heartbeat type"),
  *   handlers = {
- *     "storage" = "Drupal\heartbeat8\HeartbeatStorage",
+ *     "storage" = "Drupal\heartbeat\HeartbeatStorage",
  *     "view_builder" = "Drupal\Core\Entity\EntityViewBuilder",
- *     "list_builder" = "Drupal\heartbeat8\HeartbeatListBuilder",
- *     "views_data" = "Drupal\heartbeat8\Entity\HeartbeatViewsData",
- *     "translation" = "Drupal\heartbeat8\HeartbeatTranslationHandler",
+ *     "list_builder" = "Drupal\heartbeat\HeartbeatListBuilder",
+ *     "views_data" = "Drupal\heartbeat\Entity\HeartbeatViewsData",
+ *     "translation" = "Drupal\heartbeat\HeartbeatTranslationHandler",
  *
  *     "form" = {
- *       "default" = "Drupal\heartbeat8\Form\HeartbeatForm",
- *       "add" = "Drupal\heartbeat8\Form\HeartbeatForm",
- *       "edit" = "Drupal\heartbeat8\Form\HeartbeatForm",
- *       "delete" = "Drupal\heartbeat8\Form\HeartbeatDeleteForm",
+ *       "default" = "Drupal\heartbeat\Form\HeartbeatForm",
+ *       "add" = "Drupal\heartbeat\Form\HeartbeatForm",
+ *       "edit" = "Drupal\heartbeat\Form\HeartbeatForm",
+ *       "delete" = "Drupal\heartbeat\Form\HeartbeatDeleteForm",
  *     },
- *     "access" = "Drupal\heartbeat8\HeartbeatAccessControlHandler",
+ *     "access" = "Drupal\heartbeat\HeartbeatAccessControlHandler",
  *     "route_provider" = {
- *       "html" = "Drupal\heartbeat8\HeartbeatHtmlRouteProvider",
+ *       "html" = "Drupal\heartbeat\HeartbeatHtmlRouteProvider",
  *     },
  *   },
  *   base_table = "heartbeat",
@@ -337,7 +337,7 @@ class Heartbeat extends RevisionableContentEntityBase implements HeartbeatInterf
   /**
    * Returns the node type label for the passed node.
    *
-   * @param \Drupal\heartbeat8\Entity\HeartbeatInterface $heartbeat
+   * @param \Drupal\heartbeat\Entity\HeartbeatInterface $heartbeat
    *   A heartbeat entity to return the heartbeat type's label for.
    *
    * @return string|false
@@ -481,4 +481,13 @@ class Heartbeat extends RevisionableContentEntityBase implements HeartbeatInterf
     return $mediaObject;
   }
 
+
+  public static function getEntityNames($entityTypes) {
+    $names = array();
+    foreach ($entityTypes as $type) {
+      $names[] = $type->getLabel()->getUntranslatedString();
+    }
+
+    return $names;
+  }
 }

src/Entity/HeartbeatInterface.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace Drupal\heartbeat8\Entity;
+namespace Drupal\heartbeat\Entity;
 
 use Drupal\Core\Entity\RevisionLogInterface;
 use Drupal\Core\Entity\RevisionableInterface;
@@ -12,7 +12,7 @@ use Drupal\user\EntityOwnerInterface;
 /**
  * Provides an interface for defining Heartbeat entities.
  *
- * @ingroup heartbeat8
+ * @ingroup heartbeat
  */
 interface HeartbeatInterface extends RevisionableInterface, RevisionLogInterface, EntityChangedInterface, EntityOwnerInterface {
 
@@ -40,7 +40,7 @@ interface HeartbeatInterface extends RevisionableInterface, RevisionLogInterface
    * @param string $name
    *   The Heartbeat name.
    *
-   * @return \Drupal\heartbeat8\Entity\HeartbeatInterface
+   * @return \Drupal\heartbeat\Entity\HeartbeatInterface
    *   The called Heartbeat entity.
    */
   public function setName($name);
@@ -59,7 +59,7 @@ interface HeartbeatInterface extends RevisionableInterface, RevisionLogInterface
    * @param int $timestamp
    *   The Heartbeat creation timestamp.
    *
-   * @return \Drupal\heartbeat8\Entity\HeartbeatInterface
+   * @return \Drupal\heartbeat\Entity\HeartbeatInterface
    *   The called Heartbeat entity.
    */
   public function setCreatedTime($timestamp);
@@ -80,7 +80,7 @@ interface HeartbeatInterface extends RevisionableInterface, RevisionLogInterface
    * @param bool $published
    *   TRUE to set this Heartbeat to published, FALSE to set it to unpublished.
    *
-   * @return \Drupal\heartbeat8\Entity\HeartbeatInterface
+   * @return \Drupal\heartbeat\Entity\HeartbeatInterface
    *   The called Heartbeat entity.
    */
   public function setPublished($published);
@@ -99,7 +99,7 @@ interface HeartbeatInterface extends RevisionableInterface, RevisionLogInterface
    * @param int $timestamp
    *   The UNIX timestamp of when this revision was created.
    *
-   * @return \Drupal\heartbeat8\Entity\HeartbeatInterface
+   * @return \Drupal\heartbeat\Entity\HeartbeatInterface
    *   The called Heartbeat entity.
    */
   public function setRevisionCreationTime($timestamp);
@@ -118,7 +118,7 @@ interface HeartbeatInterface extends RevisionableInterface, RevisionLogInterface
    * @param int $uid
    *   The user ID of the revision author.
    *
-   * @return \Drupal\heartbeat8\Entity\HeartbeatInterface
+   * @return \Drupal\heartbeat\Entity\HeartbeatInterface
    *   The called Heartbeat entity.
    */
   public function setRevisionUserId($uid);

src/Entity/HeartbeatStream.php

@@ -1,8 +1,8 @@
 <?php
 
-namespace Drupal\heartbeat8\Entity;
+namespace Drupal\heartbeat\Entity;
 
-use Drupal\heartbeat8\Entity\HeartbeatType;
+use Drupal\heartbeat\Entity\HeartbeatType;
 use Drupal\Core\Entity\EntityStorageInterface;
 use Drupal\Core\Field\BaseFieldDefinition;
 use Drupal\Core\Entity\RevisionableContentEntityBase;
@@ -13,26 +13,26 @@ use Drupal\user\UserInterface;
 /**
  * Defines the Heartbeat stream entity.
  *
- * @ingroup heartbeat8
+ * @ingroup heartbeat
  *
  * @ContentEntityType(
  *   id = "heartbeat_stream",
  *   label = @Translation("Heartbeat stream"),
  *   handlers = {
- *     "storage" = "Drupal\heartbeat8\HeartbeatStreamStorage",
+ *     "storage" = "Drupal\heartbeat\HeartbeatStreamStorage",
  *     "view_builder" = "Drupal\Core\Entity\EntityViewBuilder",
- *     "list_builder" = "Drupal\heartbeat8\HeartbeatStreamListBuilder",
- *     "views_data" = "Drupal\heartbeat8\Entity\HeartbeatStreamViewsData",
+ *     "list_builder" = "Drupal\heartbeat\HeartbeatStreamListBuilder",
+ *     "views_data" = "Drupal\heartbeat\Entity\HeartbeatStreamViewsData",
  *
  *     "form" = {
- *       "default" = "Drupal\heartbeat8\Form\HeartbeatStreamForm",
- *       "add" = "Drupal\heartbeat8\Form\HeartbeatStreamForm",
- *       "edit" = "Drupal\heartbeat8\Form\HeartbeatStreamForm",
- *       "delete" = "Drupal\heartbeat8\Form\HeartbeatStreamDeleteForm",
+ *       "default" = "Drupal\heartbeat\Form\HeartbeatStreamForm",
+ *       "add" = "Drupal\heartbeat\Form\HeartbeatStreamForm",
+ *       "edit" = "Drupal\heartbeat\Form\HeartbeatStreamForm",
+ *       "delete" = "Drupal\heartbeat\Form\HeartbeatStreamDeleteForm",
  *     },
- *     "access" = "Drupal\heartbeat8\HeartbeatStreamAccessControlHandler",
+ *     "access" = "Drupal\heartbeat\HeartbeatStreamAccessControlHandler",
  *     "route_provider" = {
- *       "html" = "Drupal\heartbeat8\HeartbeatStreamHtmlRouteProvider",
+ *       "html" = "Drupal\heartbeat\HeartbeatStreamHtmlRouteProvider",
  *     },
  *   },
  *   base_table = "heartbeat_stream",
@@ -86,7 +86,7 @@ class HeartbeatStream extends RevisionableContentEntityBase implements Heartbeat
   }
 
   /**
-   * @param array use Drupal\heartbeat8\Entity\HeartbeatType $types
+   * @param array use Drupal\heartbeat\Entity\HeartbeatType $types
    */
   public function setTypes($types) {
     $this->set('types', $types);

src/Entity/HeartbeatStream.php.bak

@@ -1,6 +1,6 @@
 <?php
 
-namespace Drupal\heartbeat8\Entity;
+namespace Drupal\heartbeat\Entity;
 
 use Drupal\Core\Config\Entity\ConfigEntityBase;
 
@@ -11,14 +11,14 @@ use Drupal\Core\Config\Entity\ConfigEntityBase;
  *   id = "heartbeat_stream",
  *   label = @Translation("Heartbeat stream"),
  *   handlers = {
- *     "list_builder" = "Drupal\heartbeat8\HeartbeatStreamListBuilder",
+ *     "list_builder" = "Drupal\heartbeat\HeartbeatStreamListBuilder",
  *     "form" = {
- *       "add" = "Drupal\heartbeat8\Form\HeartbeatStreamForm",
- *       "edit" = "Drupal\heartbeat8\Form\HeartbeatStreamForm",
- *       "delete" = "Drupal\heartbeat8\Form\HeartbeatStreamDeleteForm"
+ *       "add" = "Drupal\heartbeat\Form\HeartbeatStreamForm",
+ *       "edit" = "Drupal\heartbeat\Form\HeartbeatStreamForm",
+ *       "delete" = "Drupal\heartbeat\Form\HeartbeatStreamDeleteForm"
  *     },
  *     "route_provider" = {
- *       "html" = "Drupal\heartbeat8\HeartbeatStreamHtmlRouteProvider",
+ *       "html" = "Drupal\heartbeat\HeartbeatStreamHtmlRouteProvider",
  *     },
  *   },
  *   config_prefix = "heartbeat_stream",

src/Entity/HeartbeatStreamInterface.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace Drupal\heartbeat8\Entity;
+namespace Drupal\heartbeat\Entity;
 
 use Drupal\Core\Entity\RevisionLogInterface;
 use Drupal\Core\Entity\RevisionableInterface;
@@ -12,7 +12,7 @@ use Drupal\user\EntityOwnerInterface;
 /**
  * Provides an interface for defining Heartbeat stream entities.
  *
- * @ingroup heartbeat8
+ * @ingroup heartbeat
  */
 interface HeartbeatStreamInterface extends RevisionableInterface, RevisionLogInterface, EntityChangedInterface, EntityOwnerInterface {
 
@@ -32,7 +32,7 @@ interface HeartbeatStreamInterface extends RevisionableInterface, RevisionLogInt
    * @param string $name
    *   The Heartbeat stream name.
    *
-   * @return \Drupal\heartbeat8\Entity\HeartbeatStreamInterface
+   * @return \Drupal\heartbeat\Entity\HeartbeatStreamInterface
    *   The called Heartbeat stream entity.
    */
   public function setName($name);
@@ -51,7 +51,7 @@ interface HeartbeatStreamInterface extends RevisionableInterface, RevisionLogInt
    * @param int $timestamp
    *   The Heartbeat stream creation timestamp.
    *
-   * @return \Drupal\heartbeat8\Entity\HeartbeatStreamInterface
+   * @return \Drupal\heartbeat\Entity\HeartbeatStreamInterface
    *   The called Heartbeat stream entity.
    */
   public function setCreatedTime($timestamp);
@@ -72,7 +72,7 @@ interface HeartbeatStreamInterface extends RevisionableInterface, RevisionLogInt
    * @param bool $published
    *   TRUE to set this Heartbeat stream to published, FALSE to set it to unpublished.
    *
-   * @return \Drupal\heartbeat8\Entity\HeartbeatStreamInterface
+   * @return \Drupal\heartbeat\Entity\HeartbeatStreamInterface
    *   The called Heartbeat stream entity.
    */
   public function setPublished($published);
@@ -91,7 +91,7 @@ interface HeartbeatStreamInterface extends RevisionableInterface, RevisionLogInt
    * @param int $timestamp
    *   The UNIX timestamp of when this revision was created.
    *
-   * @return \Drupal\heartbeat8\Entity\HeartbeatStreamInterface
+   * @return \Drupal\heartbeat\Entity\HeartbeatStreamInterface
    *   The called Heartbeat stream entity.
    */
   public function setRevisionCreationTime($timestamp);
@@ -110,7 +110,7 @@ interface HeartbeatStreamInterface extends RevisionableInterface, RevisionLogInt
    * @param int $uid
    *   The user ID of the revision author.
    *
-   * @return \Drupal\heartbeat8\Entity\HeartbeatStreamInterface
+   * @return \Drupal\heartbeat\Entity\HeartbeatStreamInterface
    *   The called Heartbeat stream entity.
    */
   public function setRevisionUserId($uid);

src/Entity/HeartbeatStreamInterface.php.bak

@@ -1,6 +1,6 @@
 <?php
 
-namespace Drupal\heartbeat8\Entity;
+namespace Drupal\heartbeat\Entity;
 
 use Drupal\Core\Config\Entity\ConfigEntityInterface;
 

src/Entity/HeartbeatStreamViewsData.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace Drupal\heartbeat8\Entity;
+namespace Drupal\heartbeat\Entity;
 
 use Drupal\views\EntityViewsData;
 

src/Entity/HeartbeatType.php

@@ -1,10 +1,10 @@
 <?php
 
-namespace Drupal\heartbeat8\Entity;
+namespace Drupal\heartbeat\Entity;
 
 use Drupal\Core\Config\Entity\ConfigEntityBundleBase;
 use Drupal\Core\Entity\EntityStorageInterface;
-use Drupal\heartbeat8\HeartbeatTypeListBuilder;
+use Drupal\heartbeat\HeartbeatTypeListBuilder;
 
 /**
  * Defines the Heartbeat type entity.
@@ -13,14 +13,14 @@ use Drupal\heartbeat8\HeartbeatTypeListBuilder;
  *   id = "heartbeat_type",
  *   label = @Translation("Heartbeat type"),
  *   handlers = {
- *     "list_builder" = "Drupal\heartbeat8\HeartbeatTypeListBuilder",
+ *     "list_builder" = "Drupal\heartbeat\HeartbeatTypeListBuilder",
  *     "form" = {
- *       "add" = "Drupal\heartbeat8\Form\HeartbeatTypeForm",
- *       "edit" = "Drupal\heartbeat8\Form\HeartbeatTypeForm",
- *       "delete" = "Drupal\heartbeat8\Form\HeartbeatTypeDeleteForm"
+ *       "add" = "Drupal\heartbeat\Form\HeartbeatTypeForm",
+ *       "edit" = "Drupal\heartbeat\Form\HeartbeatTypeForm",
+ *       "delete" = "Drupal\heartbeat\Form\HeartbeatTypeDeleteForm"
  *     },
  *     "route_provider" = {
- *       "html" = "Drupal\heartbeat8\HeartbeatTypeHtmlRouteProvider",
+ *       "html" = "Drupal\heartbeat\HeartbeatTypeHtmlRouteProvider",
  *     },
  *   },
  *   config_prefix = "heartbeat_type",
@@ -58,6 +58,7 @@ class HeartbeatType extends ConfigEntityBundleBase implements HeartbeatTypeInter
   protected $variables;
   protected $attachments;
   protected $groupType;
+  protected $mainEntity;
 
 
   protected $entityManager;
@@ -321,4 +322,22 @@ class HeartbeatType extends ConfigEntityBundleBase implements HeartbeatTypeInter
     // Clear the heartbeat type cache to reflect the removal.
     $storage->resetCache(array_keys($entities));
   }
+
+  /**
+   * Sets the main Entity Type of the Heartbeat Type
+   *
+   * @param string $entityType
+   *  Describing entity type used in this Heartbeat Type
+   */
+  public function setMainEntity($mainEntity) {
+    $this->set('mainEntity', $mainEntity);
+  }
+
+  /**
+   * @return mixed|null
+   *
+   */
+  public function getMainEntity() {
+    return $this->get('mainEntity');
+  }
 }

src/Entity/HeartbeatTypeInterface.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace Drupal\heartbeat8\Entity;
+namespace Drupal\heartbeat\Entity;
 
 use Drupal\Core\Config\Entity\ConfigEntityInterface;
 
@@ -41,13 +41,32 @@ interface HeartbeatTypeInterface extends ConfigEntityInterface {
   public function setDescription($description);
 
   /**
-   * Gets the description of the stream
+   * Gets the description of the HeartbeatType
    *
    * @return string
    *  The Stream's description
    */
+
   public function getDescription();
 
+  /**
+   * Sets the main Entity Type of the Heartbeat Type
+   *
+   * @param string $entityType
+   *  Describing entity type used in this Heartbeat Type
+   */
+
+  public function setMainEntity($mainEntity);
+
+  /**
+   * Gets the main Entity Type of the Heartbeat Type
+   *
+   * @return string
+   *  The Heartbeat Type's main Entity Type
+   */
+
+  public function getMainEntity();
+
   /**
    * Sets the translatable message
    * This message creates the structure of each message
@@ -56,6 +75,7 @@ interface HeartbeatTypeInterface extends ConfigEntityInterface {
    *  The template message serving as the foundation of each message structure of this stream type
    */
 
+
   public function setMessage($message);
 
   /**

src/Entity/HeartbeatViewsData.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace Drupal\heartbeat8\Entity;
+namespace Drupal\heartbeat\Entity;
 
 use Drupal\views\EntityViewsData;
 

src/Form/HeartbeatDeleteForm.php

@@ -1,13 +1,13 @@
 <?php
 
-namespace Drupal\heartbeat8\Form;
+namespace Drupal\heartbeat\Form;
 
 use Drupal\Core\Entity\ContentEntityDeleteForm;
 
 /**
  * Provides a form for deleting Heartbeat entities.
  *
- * @ingroup heartbeat8
+ * @ingroup heartbeat
  */
 class HeartbeatDeleteForm extends ContentEntityDeleteForm {
 

src/Form/HeartbeatForm.php

@@ -1,15 +1,15 @@
 <?php
 
-namespace Drupal\heartbeat8\Form;
+namespace Drupal\heartbeat\Form;
 
 use Drupal\Core\Entity\ContentEntityForm;
 use Drupal\Core\Form\FormStateInterface;
-use Drupal\heartbeat8\Entity;
+use Drupal\heartbeat\Entity;
 
 /**
  * Form controller for Heartbeat edit forms.
  *
- * @ingroup heartbeat8
+ * @ingroup heartbeat
  */
 class HeartbeatForm extends ContentEntityForm {
 
@@ -17,7 +17,7 @@ class HeartbeatForm extends ContentEntityForm {
    * {@inheritdoc}
    */
   public function buildForm(array $form, FormStateInterface $form_state) {
-    /* @var $entity \Drupal\heartbeat8\Entity\Heartbeat */
+    /* @var $entity \Drupal\heartbeat\Entity\Heartbeat */
     $form = parent::buildForm($form, $form_state);
 
     if (!$this->entity->isNew()) {

src/Form/HeartbeatRevisionDeleteForm.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace Drupal\heartbeat8\Form;
+namespace Drupal\heartbeat\Form;
 
 use Drupal\Core\Database\Connection;
 use Drupal\Core\Entity\EntityStorageInterface;
@@ -12,7 +12,7 @@ use Symfony\Component\DependencyInjection\ContainerInterface;
 /**
  * Provides a form for deleting a Heartbeat revision.
  *
- * @ingroup heartbeat8
+ * @ingroup heartbeat
  */
 class HeartbeatRevisionDeleteForm extends ConfirmFormBase {
 
@@ -20,7 +20,7 @@ class HeartbeatRevisionDeleteForm extends ConfirmFormBase {
   /**
    * The Heartbeat revision.
    *
-   * @var \Drupal\heartbeat8\Entity\HeartbeatInterface
+   * @var \Drupal\heartbeat\Entity\HeartbeatInterface
    */
   protected $revision;
 

src/Form/HeartbeatRevisionRevertForm.php

@@ -1,19 +1,19 @@
 <?php
 
-namespace Drupal\heartbeat8\Form;
+namespace Drupal\heartbeat\Form;
 
 use Drupal\Core\Datetime\DateFormatterInterface;
 use Drupal\Core\Entity\EntityStorageInterface;
 use Drupal\Core\Form\ConfirmFormBase;
 use Drupal\Core\Form\FormStateInterface;
 use Drupal\Core\Url;
-use Drupal\heartbeat8\Entity\HeartbeatInterface;
+use Drupal\heartbeat\Entity\HeartbeatInterface;
 use Symfony\Component\DependencyInjection\ContainerInterface;
 
 /**
  * Provides a form for reverting a Heartbeat revision.
  *
- * @ingroup heartbeat8
+ * @ingroup heartbeat
  */
 class HeartbeatRevisionRevertForm extends ConfirmFormBase {
 
@@ -21,7 +21,7 @@ class HeartbeatRevisionRevertForm extends ConfirmFormBase {
   /**
    * The Heartbeat revision.
    *
-   * @var \Drupal\heartbeat8\Entity\HeartbeatInterface
+   * @var \Drupal\heartbeat\Entity\HeartbeatInterface
    */
   protected $revision;
 
@@ -130,12 +130,12 @@ class HeartbeatRevisionRevertForm extends ConfirmFormBase {
   /**
    * Prepares a revision to be reverted.
    *
-   * @param \Drupal\heartbeat8\Entity\HeartbeatInterface $revision
+   * @param \Drupal\heartbeat\Entity\HeartbeatInterface $revision
    *   The revision to be reverted.
    * @param \Drupal\Core\Form\FormStateInterface $form_state
    *   The current state of the form.
    *
-   * @return \Drupal\heartbeat8\Entity\HeartbeatInterface
+   * @return \Drupal\heartbeat\Entity\HeartbeatInterface
    *   The prepared revision ready to be stored.
    */
   protected function prepareRevertedRevision(HeartbeatInterface $revision, FormStateInterface $form_state) {

src/Form/HeartbeatRevisionRevertTranslationForm.php

@@ -1,18 +1,18 @@
 <?php
 
-namespace Drupal\heartbeat8\Form;
+namespace Drupal\heartbeat\Form;
 
 use Drupal\Core\Datetime\DateFormatterInterface;
 use Drupal\Core\Entity\EntityStorageInterface;
 use Drupal\Core\Form\FormStateInterface;
 use Drupal\Core\Language\LanguageManagerInterface;
-use Drupal\heartbeat8\Entity\HeartbeatInterface;
+use Drupal\heartbeat\Entity\HeartbeatInterface;
 use Symfony\Component\DependencyInjection\ContainerInterface;
 
 /**
  * Provides a form for reverting a Heartbeat revision for a single translation.
  *
- * @ingroup heartbeat8
+ * @ingroup heartbeat
  */
 class HeartbeatRevisionRevertTranslationForm extends HeartbeatRevisionRevertForm {
 
@@ -93,7 +93,7 @@ class HeartbeatRevisionRevertTranslationForm extends HeartbeatRevisionRevertForm
   protected function prepareRevertedRevision(HeartbeatInterface $revision, FormStateInterface $form_state) {
     $revert_untranslated_fields = $form_state->getValue('revert_untranslated_fields');
 
-    /** @var \Drupal\heartbeat8\Entity\HeartbeatInterface $default_revision */
+    /** @var \Drupal\heartbeat\Entity\HeartbeatInterface $default_revision */
     $latest_revision = $this->HeartbeatStorage->load($revision->id());
     $latest_revision_translation = $latest_revision->getTranslation($this->langcode);
 

src/Form/HeartbeatSettingsForm.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace Drupal\heartbeat8\Form;
+namespace Drupal\heartbeat\Form;
 
 use Drupal\Core\Form\FormBase;
 use Drupal\Core\Form\FormStateInterface;
@@ -8,9 +8,9 @@ use Drupal\Core\Form\FormStateInterface;
 /**
  * Class HeartbeatSettingsForm.
  *
- * @package Drupal\heartbeat8\Form
+ * @package Drupal\heartbeat\Form
  *
- * @ingroup heartbeat8
+ * @ingroup heartbeat
  */
 class HeartbeatSettingsForm extends FormBase {
 

src/Form/HeartbeatStreamDeleteForm.php

@@ -1,13 +1,13 @@
 <?php
 
-namespace Drupal\heartbeat8\Form;
+namespace Drupal\heartbeat\Form;
 
 use Drupal\Core\Entity\ContentEntityDeleteForm;
 
 /**
  * Provides a form for deleting Heartbeat stream entities.
  *
- * @ingroup heartbeat8
+ * @ingroup heartbeat
  */
 class HeartbeatStreamDeleteForm extends ContentEntityDeleteForm {
 

src/Form/HeartbeatStreamForm.php

@@ -1,13 +1,13 @@
 <?php
 
-namespace Drupal\heartbeat8\Form;
+namespace Drupal\heartbeat\Form;
 
 use Drupal\Component\Datetime\TimeInterface;
 use Drupal\Core\Entity\EntityManager;
 use Drupal\Core\Entity\EntityTypeBundleInfoInterface;
-use Drupal\heartbeat8\HeartbeatTypeServices;
-use Drupal\heartbeat8\Entity\HeartbeatStream;
-use Drupal\heartbeat8\Entity\HeartbeatType;
+use Drupal\heartbeat\HeartbeatTypeServices;
+use Drupal\heartbeat\Entity\HeartbeatStream;
+use Drupal\heartbeat\Entity\HeartbeatType;
 use Drupal\Core\Database\Database;
 use Drupal\Core\Entity\ContentEntityForm;
 use Drupal\Core\Form\FormStateInterface;
@@ -16,7 +16,7 @@ use Symfony\Component\DependencyInjection\ContainerInterface;
 /**
  * Form controller for Heartbeat stream edit forms.
  *
- * @ingroup heartbeat8
+ * @ingroup heartbeat
  */
 class HeartbeatStreamForm extends ContentEntityForm {
 
@@ -29,7 +29,7 @@ class HeartbeatStreamForm extends ContentEntityForm {
    */
   public static function create(ContainerInterface $container) {
     return new static(
-      $container->get('heartbeat8.heartbeattype'),
+      $container->get('heartbeat.heartbeattype'),
       $container->get('entity.manager'),
       $container->get('entity_type.bundle.info'),
       $container->get('datetime.time')
@@ -63,7 +63,7 @@ class HeartbeatStreamForm extends ContentEntityForm {
    * {@inheritdoc}
    */
   public function buildForm(array $form, FormStateInterface $form_state) {
-    /* @var $entity \Drupal\heartbeat8\Entity\HeartbeatStream */
+    /* @var $entity \Drupal\heartbeat\Entity\HeartbeatStream */
     $form = parent::buildForm($form, $form_state);
 
     if (!$this->entity->isNew()) {

src/Form/HeartbeatStreamRevisionDeleteForm.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace Drupal\heartbeat8\Form;
+namespace Drupal\heartbeat\Form;
 
 use Drupal\Core\Database\Connection;
 use Drupal\Core\Entity\EntityStorageInterface;
@@ -12,7 +12,7 @@ use Symfony\Component\DependencyInjection\ContainerInterface;
 /**
  * Provides a form for deleting a Heartbeat stream revision.
  *
- * @ingroup heartbeat8
+ * @ingroup heartbeat
  */
 class HeartbeatStreamRevisionDeleteForm extends ConfirmFormBase {
 
@@ -20,7 +20,7 @@ class HeartbeatStreamRevisionDeleteForm extends ConfirmFormBase {
   /**
    * The Heartbeat stream revision.
    *
-   * @var \Drupal\heartbeat8\Entity\HeartbeatStreamInterface
+   * @var \Drupal\heartbeat\Entity\HeartbeatStreamInterface
    */
   protected $revision;
 

src/Form/HeartbeatStreamRevisionRevertForm.php

@@ -1,19 +1,19 @@
 <?php
 
-namespace Drupal\heartbeat8\Form;
+namespace Drupal\heartbeat\Form;
 
 use Drupal\Core\Datetime\DateFormatterInterface;
 use Drupal\Core\Entity\EntityStorageInterface;
 use Drupal\Core\Form\ConfirmFormBase;
 use Drupal\Core\Form\FormStateInterface;
 use Drupal\Core\Url;
-use Drupal\heartbeat8\Entity\HeartbeatStreamInterface;
+use Drupal\heartbeat\Entity\HeartbeatStreamInterface;
 use Symfony\Component\DependencyInjection\ContainerInterface;
 
 /**
  * Provides a form for reverting a Heartbeat stream revision.
  *
- * @ingroup heartbeat8
+ * @ingroup heartbeat
  */
 class HeartbeatStreamRevisionRevertForm extends ConfirmFormBase {
 
@@ -21,7 +21,7 @@ class HeartbeatStreamRevisionRevertForm extends ConfirmFormBase {
   /**
    * The Heartbeat stream revision.
    *
-   * @var \Drupal\heartbeat8\Entity\HeartbeatStreamInterface
+   * @var \Drupal\heartbeat\Entity\HeartbeatStreamInterface
    */
   protected $revision;
 
@@ -130,12 +130,12 @@ class HeartbeatStreamRevisionRevertForm extends ConfirmFormBase {
   /**
    * Prepares a revision to be reverted.
    *
-   * @param \Drupal\heartbeat8\Entity\HeartbeatStreamInterface $revision
+   * @param \Drupal\heartbeat\Entity\HeartbeatStreamInterface $revision
    *   The revision to be reverted.
    * @param \Drupal\Core\Form\FormStateInterface $form_state
    *   The current state of the form.
    *
-   * @return \Drupal\heartbeat8\Entity\HeartbeatStreamInterface
+   * @return \Drupal\heartbeat\Entity\HeartbeatStreamInterface
    *   The prepared revision ready to be stored.
    */
   protected function prepareRevertedRevision(HeartbeatStreamInterface $revision, FormStateInterface $form_state) {

src/Form/HeartbeatStreamRevisionRevertTranslationForm.php

@@ -1,18 +1,18 @@
 <?php
 
-namespace Drupal\heartbeat8\Form;
+namespace Drupal\heartbeat\Form;
 
 use Drupal\Core\Datetime\DateFormatterInterface;
 use Drupal\Core\Entity\EntityStorageInterface;
 use Drupal\Core\Form\FormStateInterface;
 use Drupal\Core\Language\LanguageManagerInterface;
-use Drupal\heartbeat8\Entity\HeartbeatStreamInterface;
+use Drupal\heartbeat\Entity\HeartbeatStreamInterface;
 use Symfony\Component\DependencyInjection\ContainerInterface;
 
 /**
  * Provides a form for reverting a Heartbeat stream revision for a single translation.
  *
- * @ingroup heartbeat8
+ * @ingroup heartbeat
  */
 class HeartbeatStreamRevisionRevertTranslationForm extends HeartbeatStreamRevisionRevertForm {
 
@@ -93,7 +93,7 @@ class HeartbeatStreamRevisionRevertTranslationForm extends HeartbeatStreamRevisi
   protected function prepareRevertedRevision(HeartbeatStreamInterface $revision, FormStateInterface $form_state) {
     $revert_untranslated_fields = $form_state->getValue('revert_untranslated_fields');
 
-    /** @var \Drupal\heartbeat8\Entity\HeartbeatStreamInterface $default_revision */
+    /** @var \Drupal\heartbeat\Entity\HeartbeatStreamInterface $default_revision */
     $latest_revision = $this->HeartbeatStreamStorage->load($revision->id());
     $latest_revision_translation = $latest_revision->getTranslation($this->langcode);
 

src/Form/HeartbeatStreamSettingsForm.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace Drupal\heartbeat8\Form;
+namespace Drupal\heartbeat\Form;
 
 use Drupal\Core\Form\FormBase;
 use Drupal\Core\Form\FormStateInterface;
@@ -8,9 +8,9 @@ use Drupal\Core\Form\FormStateInterface;
 /**
  * Class HeartbeatStreamSettingsForm.
  *
- * @package Drupal\heartbeat8\Form
+ * @package Drupal\heartbeat\Form
  *
- * @ingroup heartbeat8
+ * @ingroup heartbeat
  */
 class HeartbeatStreamSettingsForm extends FormBase {
 

src/Form/HeartbeatTypeDeleteForm.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace Drupal\heartbeat8\Form;
+namespace Drupal\heartbeat\Form;
 
 use Drupal\Core\Entity\EntityConfirmFormBase;
 use Drupal\Core\Form\FormStateInterface;

src/Form/HeartbeatTypeForm.php

@@ -1,10 +1,11 @@
 <?php
 
-namespace Drupal\heartbeat8\Form;
+namespace Drupal\heartbeat\Form;
 
+use Drupal\Core\Entity\EntityTypeManager;
 use Drupal\Core\Render\Renderer;
-use Drupal\heartbeat8;
-use Drupal\heartbeat8\Entity;
+use Drupal\heartbeat;
+use Drupal\heartbeat\Entity;
 use Drupal\Core\Ajax\AjaxResponse;
 use Drupal\Core\Ajax\HtmlCommand;
 use Drupal\Core\Ajax\InvokeCommand;
@@ -17,7 +18,7 @@ use Symfony\Component\DependencyInjection\ContainerInterface;
  * Class HeartbeatTypeForm.
  *
  * @property \Drupal\Component\Render\MarkupInterface|string tokenTree
- * @package Drupal\heartbeat8\Form
+ * @package Drupal\heartbeat\Form
  */
 class HeartbeatTypeForm extends EntityForm {
 
@@ -27,6 +28,10 @@ class HeartbeatTypeForm extends EntityForm {
 
   private $tokenTree;
 
+  protected $entityTypeManager;
+
+  protected $entityTypes;
+
   private $treeAdded = false;
 
 
@@ -37,7 +42,8 @@ class HeartbeatTypeForm extends EntityForm {
   public static function create(ContainerInterface $container) {
     return new static(
       $container->get('token.tree_builder'),
-      $container->get('renderer'));
+      $container->get('renderer'),
+      $container->get('entity_type.manager'));
   }
 
 
@@ -54,11 +60,12 @@ class HeartbeatTypeForm extends EntityForm {
    * @param Renderer $renderer
    * @throws \Exception
    */
-  public function __construct(TreeBuilder $tree_builder, Renderer $renderer) {
+  public function __construct(TreeBuilder $tree_builder, Renderer $renderer, EntityTypeManager $entityTypeManager) {
 
 
     $this->treeBuilder = $tree_builder;
     $this->renderer = $renderer;
+    $this->entityTypeManager = $entityTypeManager;
 
     $this->tokenTree = $this->renderer->render($this->treeBuilder->buildAllRenderable([
       'click_insert' => TRUE,
@@ -71,6 +78,7 @@ class HeartbeatTypeForm extends EntityForm {
 
   public function buildForm(array $form, FormStateInterface $form_state) {
 
+    $this->entityTypes = Entity\Heartbeat::getEntityNames($this->entityTypeManager->getDefinitions());
     $doStuff = 'stuff';
     return parent::buildForm($form, $form_state);
   }
@@ -87,7 +95,7 @@ class HeartbeatTypeForm extends EntityForm {
     $tokens = \Drupal::token()->getInfo();
     $form['#tree'] = TRUE;
 
-    $form['#attached']['library'] = 'heartbeat8/treeTable';
+    $form['#attached']['library'] = 'heartbeat/treeTable';
 
     $form['label'] = array(
       '#type' => 'textfield',
@@ -109,6 +117,17 @@ class HeartbeatTypeForm extends EntityForm {
     );
 
 
+    $form['entity_type'] = array(
+      '#type' => 'select',
+      '#title' => $this->t('Entity Type'),
+//      '#default_value' => $heartbeat_type->getEntityType(),
+      '#description' => $this->t("Primary Entity Type for this Heartbeat Type"),
+      '#options' => array($this->entityTypes
+      ),
+      '#required' => TRUE,
+    );
+
+
     $form['message'] = array(
       '#type' => 'textfield',
       '#title' => $this->t('message'),
@@ -222,7 +241,7 @@ class HeartbeatTypeForm extends EntityForm {
       '#type' => 'machine_name',
       '#default_value' => $heartbeat_type->id(),
       '#machine_name' => [
-        'exists' => '\Drupal\heartbeat8\Entity\HeartbeatType::load',
+        'exists' => '\Drupal\heartbeat\Entity\HeartbeatType::load',
       ],
       '#disabled' => !$heartbeat_type->isNew(),
     ];

src/HeartbeatAccessControlHandler.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace Drupal\heartbeat8;
+namespace Drupal\heartbeat;
 
 use Drupal\Core\Entity\EntityAccessControlHandler;
 use Drupal\Core\Entity\EntityInterface;
@@ -10,7 +10,7 @@ use Drupal\Core\Access\AccessResult;
 /**
  * Access controller for the Heartbeat entity.
  *
- * @see \Drupal\heartbeat8\Entity\Heartbeat.
+ * @see \Drupal\heartbeat\Entity\Heartbeat.
  */
 class HeartbeatAccessControlHandler extends EntityAccessControlHandler {
 
@@ -18,7 +18,7 @@ class HeartbeatAccessControlHandler extends EntityAccessControlHandler {
    * {@inheritdoc}
    */
   protected function checkAccess(EntityInterface $entity, $operation, AccountInterface $account) {
-    /** @var \Drupal\heartbeat8\Entity\HeartbeatInterface $entity */
+    /** @var \Drupal\heartbeat\Entity\HeartbeatInterface $entity */
     switch ($operation) {
       case 'view':
         if (!$entity->isPublished()) {

src/HeartbeatAltServices.php

@@ -1,16 +1,16 @@
 <?php
 
-namespace Drupal\heartbeat8;
+namespace Drupal\heartbeat;
 use Drupal\Core\Entity\Query\QueryFactory;
 use Drupal\Core\Entity\EntityManager;
 use Drupal\Core\Entity\EntityTypeManager;
 use Drupal\Core\Entity\EntityTypeRepository;
-use Drupal\heartbeat8\HeartbeatTypeServices;
+use Drupal\heartbeat\HeartbeatTypeServices;
 
 /**
  * Class HeartbeatAltServices.
  *
- * @package Drupal\heartbeat8
+ * @package Drupal\heartbeat
  */
 class HeartbeatAltServices {
 
@@ -39,20 +39,20 @@ class HeartbeatAltServices {
 //   */
 //  protected $;
 //  /**
-//   * Drupal\heartbeat8\HeartbeatTypeServices definition.
+//   * Drupal\heartbeat\HeartbeatTypeServices definition.
 //   *
-//   * @var \Drupal\heartbeat8\HeartbeatTypeServices
+//   * @var \Drupal\heartbeat\HeartbeatTypeServices
 //   */
 //  protected $;
 //  /**
 //   * Constructor.
 //   */
-//  public function __construct(QueryFactory $entity_query, EntityManager $entity_manager, EntityTypeManager $entity_type_manager, EntityTypeRepository $entity_type_repository, HeartbeatTypeServices $heartbeat8_heartbeattype) {
+//  public function __construct(QueryFactory $entity_query, EntityManager $entity_manager, EntityTypeManager $entity_type_manager, EntityTypeRepository $entity_type_repository, HeartbeatTypeServices $heartbeat_heartbeattype) {
 //    $this-> = $entity_query;
 //    $this-> = $entity_manager;
 //    $this-> = $entity_type_manager;
 //    $this-> = $entity_type_repository;
-//    $this-> = $heartbeat8_heartbeattype;
+//    $this-> = $heartbeat_heartbeattype;
 //  }
 
 }

src/HeartbeatHtmlRouteProvider.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace Drupal\heartbeat8;
+namespace Drupal\heartbeat;
 
 use Drupal\Core\Entity\EntityTypeInterface;
 use Drupal\Core\Entity\Routing\AdminHtmlRouteProvider;
@@ -93,7 +93,7 @@ class HeartbeatHtmlRouteProvider extends AdminHtmlRouteProvider {
       $route
         ->setDefaults([
           '_title' => "{$entity_type->getLabel()} revisions",
-          '_controller' => '\Drupal\heartbeat8\Controller\HeartbeatController::revisionOverview',
+          '_controller' => '\Drupal\heartbeat\Controller\HeartbeatController::revisionOverview',
         ])
         ->setRequirement('_permission', 'access heartbeat revisions')
         ->setOption('_admin_route', TRUE);
@@ -116,8 +116,8 @@ class HeartbeatHtmlRouteProvider extends AdminHtmlRouteProvider {
       $route = new Route($entity_type->getLinkTemplate('revision'));
       $route
         ->setDefaults([
-          '_controller' => '\Drupal\heartbeat8\Controller\HeartbeatController::revisionShow',
-          '_title_callback' => '\Drupal\heartbeat8\Controller\HeartbeatController::revisionPageTitle',
+          '_controller' => '\Drupal\heartbeat\Controller\HeartbeatController::revisionShow',
+          '_title_callback' => '\Drupal\heartbeat\Controller\HeartbeatController::revisionPageTitle',
         ])
         ->setRequirement('_permission', 'access heartbeat revisions')
         ->setOption('_admin_route', TRUE);
@@ -140,7 +140,7 @@ class HeartbeatHtmlRouteProvider extends AdminHtmlRouteProvider {
       $route = new Route($entity_type->getLinkTemplate('revision_revert'));
       $route
         ->setDefaults([
-          '_form' => '\Drupal\heartbeat8\Form\HeartbeatRevisionRevertForm',
+          '_form' => '\Drupal\heartbeat\Form\HeartbeatRevisionRevertForm',
           '_title' => 'Revert to earlier revision',
         ])
         ->setRequirement('_permission', 'revert all heartbeat revisions')
@@ -164,7 +164,7 @@ class HeartbeatHtmlRouteProvider extends AdminHtmlRouteProvider {
       $route = new Route($entity_type->getLinkTemplate('revision_delete'));
       $route
         ->setDefaults([
-          '_form' => '\Drupal\heartbeat8\Form\HeartbeatRevisionDeleteForm',
+          '_form' => '\Drupal\heartbeat\Form\HeartbeatRevisionDeleteForm',
           '_title' => 'Delete earlier revision',
         ])
         ->setRequirement('_permission', 'delete all heartbeat revisions')
@@ -188,7 +188,7 @@ class HeartbeatHtmlRouteProvider extends AdminHtmlRouteProvider {
       $route = new Route($entity_type->getLinkTemplate('translation_revert'));
       $route
         ->setDefaults([
-          '_form' => '\Drupal\heartbeat8\Form\HeartbeatRevisionRevertTranslationForm',
+          '_form' => '\Drupal\heartbeat\Form\HeartbeatRevisionRevertTranslationForm',
           '_title' => 'Revert to earlier revision of a translation',
         ])
         ->setRequirement('_permission', 'revert all heartbeat revisions')
@@ -212,7 +212,7 @@ class HeartbeatHtmlRouteProvider extends AdminHtmlRouteProvider {
       $route = new Route("/admin/structure/{$entity_type->id()}/settings");
       $route
         ->setDefaults([
-          '_form' => 'Drupal\heartbeat8\Form\HeartbeatSettingsForm',
+          '_form' => 'Drupal\heartbeat\Form\HeartbeatSettingsForm',
           '_title' => "{$entity_type->getLabel()} settings",
         ])
         ->setRequirement('_permission', $entity_type->getAdminPermission())

src/HeartbeatListBuilder.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace Drupal\heartbeat8;
+namespace Drupal\heartbeat;
 
 use Drupal\Core\Entity\EntityInterface;
 use Drupal\Core\Entity\EntityListBuilder;
@@ -10,7 +10,7 @@ use Drupal\Core\Url;
 /**
  * Defines a class to build a listing of Heartbeat entities.
  *
- * @ingroup heartbeat8
+ * @ingroup heartbeat
  */
 class HeartbeatListBuilder extends EntityListBuilder {
 
@@ -29,7 +29,7 @@ class HeartbeatListBuilder extends EntityListBuilder {
    * {@inheritdoc}
    */
   public function buildRow(EntityInterface $entity) {
-    /* @var $entity \Drupal\heartbeat8\Entity\Heartbeat */
+    /* @var $entity \Drupal\heartbeat\Entity\Heartbeat */
     $row['id'] = $entity->id();
     $row['name'] = $this->l(
       $entity->label(),

src/HeartbeatStorage.php

@@ -1,11 +1,11 @@
 <?php
 
-namespace Drupal\heartbeat8;
+namespace Drupal\heartbeat;
 
 use Drupal\Core\Entity\Sql\SqlContentEntityStorage;
 use Drupal\Core\Session\AccountInterface;
 use Drupal\Core\Language\LanguageInterface;
-use Drupal\heartbeat8\Entity\HeartbeatInterface;
+use Drupal\heartbeat\Entity\HeartbeatInterface;
 
 /**
  * Defines the storage handler class for Heartbeat entities.
@@ -13,7 +13,7 @@ use Drupal\heartbeat8\Entity\HeartbeatInterface;
  * This extends the base storage class, adding required special handling for
  * Heartbeat entities.
  *
- * @ingroup heartbeat8
+ * @ingroup heartbeat
  */
 class HeartbeatStorage extends SqlContentEntityStorage implements HeartbeatStorageInterface {
 

src/HeartbeatStorageInterface.php

@@ -1,11 +1,11 @@
 <?php
 
-namespace Drupal\heartbeat8;
+namespace Drupal\heartbeat;
 
 use Drupal\Core\Entity\ContentEntityStorageInterface;
 use Drupal\Core\Session\AccountInterface;
 use Drupal\Core\Language\LanguageInterface;
-use Drupal\heartbeat8\Entity\HeartbeatInterface;
+use Drupal\heartbeat\Entity\HeartbeatInterface;
 
 /**
  * Defines the storage handler class for Heartbeat entities.
@@ -13,14 +13,14 @@ use Drupal\heartbeat8\Entity\HeartbeatInterface;
  * This extends the base storage class, adding required special handling for
  * Heartbeat entities.
  *
- * @ingroup heartbeat8
+ * @ingroup heartbeat
  */
 interface HeartbeatStorageInterface extends ContentEntityStorageInterface {
 
   /**
    * Gets a list of Heartbeat revision IDs for a specific Heartbeat.
    *
-   * @param \Drupal\heartbeat8\Entity\HeartbeatInterface $entity
+   * @param \Drupal\heartbeat\Entity\HeartbeatInterface $entity
    *   The Heartbeat entity.
    *
    * @return int[]
@@ -42,7 +42,7 @@ interface HeartbeatStorageInterface extends ContentEntityStorageInterface {
   /**
    * Counts the number of revisions in the default language.
    *
-   * @param \Drupal\heartbeat8\Entity\HeartbeatInterface $entity
+   * @param \Drupal\heartbeat\Entity\HeartbeatInterface $entity
    *   The Heartbeat entity.
    *
    * @return int

src/HeartbeatStreamAccessControlHandler.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace Drupal\heartbeat8;
+namespace Drupal\heartbeat;
 
 use Drupal\Core\Entity\EntityAccessControlHandler;
 use Drupal\Core\Entity\EntityInterface;
@@ -10,7 +10,7 @@ use Drupal\Core\Access\AccessResult;
 /**
  * Access controller for the Heartbeat stream entity.
  *
- * @see \Drupal\heartbeat8\Entity\HeartbeatStream.
+ * @see \Drupal\heartbeat\Entity\HeartbeatStream.
  */
 class HeartbeatStreamAccessControlHandler extends EntityAccessControlHandler {
 
@@ -18,7 +18,7 @@ class HeartbeatStreamAccessControlHandler extends EntityAccessControlHandler {
    * {@inheritdoc}
    */
   protected function checkAccess(EntityInterface $entity, $operation, AccountInterface $account) {
-    /** @var \Drupal\heartbeat8\Entity\HeartbeatStreamInterface $entity */
+    /** @var \Drupal\heartbeat\Entity\HeartbeatStreamInterface $entity */
     switch ($operation) {
       case 'view':
         if (!$entity->isPublished()) {

src/HeartbeatStreamHtmlRouteProvider.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace Drupal\heartbeat8;
+namespace Drupal\heartbeat;
 
 use Drupal\Core\Entity\EntityTypeInterface;
 use Drupal\Core\Entity\Routing\AdminHtmlRouteProvider;
@@ -89,7 +89,7 @@ class HeartbeatStreamHtmlRouteProvider extends AdminHtmlRouteProvider {
       $route
         ->setDefaults([
           '_title' => "{$entity_type->getLabel()} revisions",
-          '_controller' => '\Drupal\heartbeat8\Controller\HeartbeatStreamController::revisionOverview',
+          '_controller' => '\Drupal\heartbeat\Controller\HeartbeatStreamController::revisionOverview',
         ])
         ->setRequirement('_permission', 'access heartbeat stream revisions')
         ->setOption('_admin_route', TRUE);
@@ -112,8 +112,8 @@ class HeartbeatStreamHtmlRouteProvider extends AdminHtmlRouteProvider {
       $route = new Route($entity_type->getLinkTemplate('revision'));
       $route
         ->setDefaults([
-          '_controller' => '\Drupal\heartbeat8\Controller\HeartbeatStreamController::revisionShow',
-          '_title_callback' => '\Drupal\heartbeat8\Controller\HeartbeatStreamController::revisionPageTitle',
+          '_controller' => '\Drupal\heartbeat\Controller\HeartbeatStreamController::revisionShow',
+          '_title_callback' => '\Drupal\heartbeat\Controller\HeartbeatStreamController::revisionPageTitle',
         ])
         ->setRequirement('_permission', 'access heartbeat stream revisions')
         ->setOption('_admin_route', TRUE);
@@ -136,7 +136,7 @@ class HeartbeatStreamHtmlRouteProvider extends AdminHtmlRouteProvider {
       $route = new Route($entity_type->getLinkTemplate('revision_revert'));
       $route
         ->setDefaults([
-          '_form' => '\Drupal\heartbeat8\Form\HeartbeatStreamRevisionRevertForm',
+          '_form' => '\Drupal\heartbeat\Form\HeartbeatStreamRevisionRevertForm',
           '_title' => 'Revert to earlier revision',
         ])
         ->setRequirement('_permission', 'revert all heartbeat stream revisions')
@@ -160,7 +160,7 @@ class HeartbeatStreamHtmlRouteProvider extends AdminHtmlRouteProvider {
       $route = new Route($entity_type->getLinkTemplate('revision_delete'));
       $route
         ->setDefaults([
-          '_form' => '\Drupal\heartbeat8\Form\HeartbeatStreamRevisionDeleteForm',
+          '_form' => '\Drupal\heartbeat\Form\HeartbeatStreamRevisionDeleteForm',
           '_title' => 'Delete earlier revision',
         ])
         ->setRequirement('_permission', 'delete all heartbeat stream revisions')
@@ -184,7 +184,7 @@ class HeartbeatStreamHtmlRouteProvider extends AdminHtmlRouteProvider {
       $route = new Route("/admin/structure/{$entity_type->id()}/settings");
       $route
         ->setDefaults([
-          '_form' => 'Drupal\heartbeat8\Form\HeartbeatStreamSettingsForm',
+          '_form' => 'Drupal\heartbeat\Form\HeartbeatStreamSettingsForm',
           '_title' => "{$entity_type->getLabel()} settings",
         ])
         ->setRequirement('_permission', $entity_type->getAdminPermission())

src/HeartbeatStreamHtmlRouteProvider.php.bak

@@ -1,59 +0,0 @@
-<?php
-
-namespace Drupal\heartbeat8;
-
-use Drupal\Core\Entity\EntityTypeInterface;
-use Drupal\Core\Entity\Routing\AdminHtmlRouteProvider;
-use Symfony\Component\Routing\Route;
-
-/**
- * Provides routes for Heartbeat stream entities.
- *
- * @see Drupal\Core\Entity\Routing\AdminHtmlRouteProvider
- * @see Drupal\Core\Entity\Routing\DefaultHtmlRouteProvider
- */
-class HeartbeatStreamHtmlRouteProvider extends AdminHtmlRouteProvider {
-
-  /**
-   * {@inheritdoc}
-   */
-  public function getRoutes(EntityTypeInterface $entity_type) {
-    $collection = parent::getRoutes($entity_type);
-
-    $entity_type_id = $entity_type->id();
-
-    if ($collection_route = $this->getCollectionRoute($entity_type)) {
-      $collection->add("entity.{$entity_type_id}.collection", $collection_route);
-    }
-
-    return $collection;
-  }
-
-  /**
-   * Gets the collection route.
-   *
-   * @param \Drupal\Core\Entity\EntityTypeInterface $entity_type
-   *   The entity type.
-   *
-   * @return \Symfony\Component\Routing\Route|null
-   *   The generated route, if available.
-   */
-  protected function getCollectionRoute(EntityTypeInterface $entity_type) {
-    if ($entity_type->hasLinkTemplate('collection') && $entity_type->hasListBuilderClass()) {
-      $entity_type_id = $entity_type->id();
-      $route = new Route($entity_type->getLinkTemplate('collection'));
-      $route
-        ->setDefaults([
-          '_entity_list' => $entity_type_id,
-          // Make sure this is not a TranslatableMarkup object as the
-          // TitleResolver translates this string again.
-          '_title' => (string) $entity_type->getLabel(),
-        ])
-        ->setRequirement('_permission', $entity_type->getAdminPermission())
-        ->setOption('_admin_route', TRUE);
-
-      return $route;
-    }
-  }
-
-}

src/HeartbeatStreamListBuilder.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace Drupal\heartbeat8;
+namespace Drupal\heartbeat;
 
 use Drupal\Core\Entity\EntityInterface;
 use Drupal\Core\Entity\EntityListBuilder;
@@ -10,7 +10,7 @@ use Drupal\Core\Url;
 /**
  * Defines a class to build a listing of Heartbeat stream entities.
  *
- * @ingroup heartbeat8
+ * @ingroup heartbeat
  */
 class HeartbeatStreamListBuilder extends EntityListBuilder {
 
@@ -29,7 +29,7 @@ class HeartbeatStreamListBuilder extends EntityListBuilder {
    * {@inheritdoc}
    */
   public function buildRow(EntityInterface $entity) {
-    /* @var $entity \Drupal\heartbeat8\Entity\HeartbeatStream */
+    /* @var $entity \Drupal\heartbeat\Entity\HeartbeatStream */
     $row['id'] = $entity->id();
     $row['name'] = $this->l(
       $entity->label(),

src/HeartbeatStreamListBuilder.php.bak

@@ -1,32 +0,0 @@
-<?php
-
-namespace Drupal\heartbeat8;
-
-use Drupal\Core\Config\Entity\ConfigEntityListBuilder;
-use Drupal\Core\Entity\EntityInterface;
-
-/**
- * Provides a listing of Heartbeat stream entities.
- */
-class HeartbeatStreamListBuilder extends ConfigEntityListBuilder {
-
-  /**
-   * {@inheritdoc}
-   */
-  public function buildHeader() {
-    $header['label'] = $this->t('Heartbeat stream');
-    $header['id'] = $this->t('Machine name');
-    return $header + parent::buildHeader();
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function buildRow(EntityInterface $entity) {
-    $row['label'] = $entity->label();
-    $row['id'] = $entity->id();
-    // You probably want a few more properties here...
-    return $row + parent::buildRow($entity);
-  }
-
-}

src/HeartbeatStreamServices.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace Drupal\heartbeat8;
+namespace Drupal\heartbeat;
 
 use Drupal\Core\Entity\EntityTypeManager;
 use Drupal\Core\Entity\EntityTypeRepository;
@@ -9,7 +9,7 @@ use Drupal\Core\Entity\Query\QueryFactory;
 /**
  * Class HeartbeatStreamServices.
  *
- * @package Drupal\heartbeat8
+ * @package Drupal\heartbeat
  */
 class HeartbeatStreamServices {
 

src/HeartbeatStreamStorage.php

@@ -1,11 +1,11 @@
 <?php
 
-namespace Drupal\heartbeat8;
+namespace Drupal\heartbeat;
 
 use Drupal\Core\Entity\Sql\SqlContentEntityStorage;
 use Drupal\Core\Session\AccountInterface;
 use Drupal\Core\Language\LanguageInterface;
-use Drupal\heartbeat8\Entity\HeartbeatStreamInterface;
+use Drupal\heartbeat\Entity\HeartbeatStreamInterface;
 
 /**
  * Defines the storage handler class for Heartbeat stream entities.
@@ -13,7 +13,7 @@ use Drupal\heartbeat8\Entity\HeartbeatStreamInterface;
  * This extends the base storage class, adding required special handling for
  * Heartbeat stream entities.
  *
- * @ingroup heartbeat8
+ * @ingroup heartbeat
  */
 class HeartbeatStreamStorage extends SqlContentEntityStorage implements HeartbeatStreamStorageInterface {
 

src/HeartbeatStreamStorageInterface.php

@@ -1,11 +1,11 @@
 <?php
 
-namespace Drupal\heartbeat8;
+namespace Drupal\heartbeat;
 
 use Drupal\Core\Entity\ContentEntityStorageInterface;
 use Drupal\Core\Session\AccountInterface;
 use Drupal\Core\Language\LanguageInterface;
-use Drupal\heartbeat8\Entity\HeartbeatStreamInterface;
+use Drupal\heartbeat\Entity\HeartbeatStreamInterface;
 
 /**
  * Defines the storage handler class for Heartbeat stream entities.
@@ -13,14 +13,14 @@ use Drupal\heartbeat8\Entity\HeartbeatStreamInterface;
  * This extends the base storage class, adding required special handling for
  * Heartbeat stream entities.
  *
- * @ingroup heartbeat8
+ * @ingroup heartbeat
  */
 interface HeartbeatStreamStorageInterface extends ContentEntityStorageInterface {
 
   /**
    * Gets a list of Heartbeat stream revision IDs for a specific Heartbeat stream.
    *
-   * @param \Drupal\heartbeat8\Entity\HeartbeatStreamInterface $entity
+   * @param \Drupal\heartbeat\Entity\HeartbeatStreamInterface $entity
    *   The Heartbeat stream entity.
    *
    * @return int[]
@@ -42,7 +42,7 @@ interface HeartbeatStreamStorageInterface extends ContentEntityStorageInterface
   /**
    * Counts the number of revisions in the default language.
    *
-   * @param \Drupal\heartbeat8\Entity\HeartbeatStreamInterface $entity
+   * @param \Drupal\heartbeat\Entity\HeartbeatStreamInterface $entity
    *   The Heartbeat stream entity.
    *
    * @return int

src/HeartbeatTranslationHandler.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace Drupal\heartbeat8;
+namespace Drupal\heartbeat;
 
 use Drupal\content_translation\ContentTranslationHandler;
 

src/HeartbeatTypeHtmlRouteProvider.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace Drupal\heartbeat8;
+namespace Drupal\heartbeat;
 
 use Drupal\Core\Entity\EntityTypeInterface;
 use Drupal\Core\Entity\Routing\AdminHtmlRouteProvider;

src/HeartbeatTypeListBuilder.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace Drupal\heartbeat8;
+namespace Drupal\heartbeat;
 
 use Drupal\Core\Config\Entity\ConfigEntityListBuilder;
 use Drupal\Core\Entity\EntityInterface;

src/HeartbeatTypeServices.php

@@ -1,13 +1,13 @@
 <?php
 
-namespace Drupal\heartbeat8;
+namespace Drupal\heartbeat;
 use Drupal\Core\Entity\EntityTypeManager;
 use Drupal\Core\Entity\Query\QueryFactory;
 
 /**
  * Class HeartbeatTypeServices.
  *
- * @package Drupal\heartbeat8
+ * @package Drupal\heartbeat
  */
 class HeartbeatTypeServices {