diff --git a/src/Entity/Flag.php b/src/Entity/Flag.php
index afecedd..597c457 100644
--- a/src/Entity/Flag.php
+++ b/src/Entity/Flag.php
@@ -35,6 +35,15 @@ use Drupal\flag\FlagInterface;
  *     "id" = "id",
  *     "label" = "label",
  *     "weight" = "weight",
+ *     "flag_short" = "flagShort",
+ *     "flag_long" = "flagLong",
+ *     "flag_message" = "flagMessage",
+ *     "unflag_short" = "unflagShort",
+ *     "unflag_long" = "unflagShort",
+ *     "unflag_message" = "unflagMessage",
+ *     "unflag_denied_text" = "unflagDeniedMessage",
+ *     "flag_type" = "flagType",
+ *     "link_type" = "linkType",
  *   },
  *   config_export = {
  *     "id",
@@ -86,7 +95,7 @@ class Flag extends ConfigEntityBundleBase implements FlagInterface {
    *
    * @var string
    */
-  protected $entity_type = NULL;
+  protected $entityType = NULL;
 
   /**
    * The flag label.
@@ -123,56 +132,56 @@ class Flag extends ConfigEntityBundleBase implements FlagInterface {
    *
    * @var string
    */
-  protected $flag_short = '';
+  protected $flagShort = '';
 
   /**
    * The description of the "flag this" link.
    *
    * @var string
    */
-  protected $flag_long = '';
+  protected $flagLong = '';
 
   /**
    * Message displayed after flagging an entity.
    *
    * @var string
    */
-  protected $flag_message = '';
+  protected $flagMessage = '';
 
   /**
    * The text for the "unflag this" link for this flag.
    *
    * @var string
    */
-  protected $unflag_short = '';
+  protected $unflagShort = '';
 
   /**
    * The description of the "unflag this" link.
    *
    * @var string
    */
-  protected $unflag_long = '';
+  protected $unflagLong = '';
 
   /**
    * Message displayed after flagging an entity.
    *
    * @var string
    */
-  protected $unflag_message = '';
+  protected $unflagMessage = '';
 
   /**
    * Message displayed if users aren't allowed to unflag.
    *
    * @var string
    */
-  protected $unflag_denied_text = '';
+  protected $unflagDeniedText = '';
 
   /**
    * The ID of the FlagType plugin.
    *
    * @var string
    */
-  protected $flag_type;
+  protected $flagType;
 
   /**
    * A collection to store the FlagType plugin.
@@ -194,7 +203,7 @@ class Flag extends ConfigEntityBundleBase implements FlagInterface {
    * @var string
    * @see \Drupal\flag\ActionLinkTypeBase
    */
-  protected $link_type = 'reload';
+  protected $linkType = 'reload';
 
   /**
    * A collection to store the ActionLink plugin.
@@ -223,17 +232,17 @@ class Flag extends ConfigEntityBundleBase implements FlagInterface {
   public function __construct(array $values, $entity_type) {
     parent::__construct($values, $entity_type);
 
-    if ($this->flag_type) {
+    if ($this->flagType) {
       $this->flagTypeCollection = new DefaultSingleLazyPluginCollection(
         \Drupal::service('plugin.manager.flag.flagtype'),
-        $this->flag_type, $this->flagTypeConfig
+        $this->flagType, $this->flagTypeConfig
       );
     }
 
-    if ($this->link_type) {
+    if ($this->linkType) {
       $this->linkTypeCollection = new DefaultSingleLazyPluginCollection(
         \Drupal::service('plugin.manager.flag.linktype'),
-        $this->link_type, $this->linkTypeConfig
+        $this->linkType, $this->linkTypeConfig
       );
     }
   }
@@ -295,7 +304,7 @@ class Flag extends ConfigEntityBundleBase implements FlagInterface {
    * {@inheritdoc}
    */
   public function getFlaggableEntityTypeId() {
-    return $this->entity_type;
+    return $this->entityType;
   }
 
   /**
@@ -314,7 +323,7 @@ class Flag extends ConfigEntityBundleBase implements FlagInterface {
     if (empty($bundles)) {
       // If the setting is empty, return all bundle names for the flag's entity
       // type.
-      $bundle_info = \Drupal::entityManager()->getBundleInfo($this->entity_type);
+      $bundle_info = \Drupal::entityManager()->getBundleInfo($this->entityType);
       $bundles = array_keys($bundle_info);
     }
 
@@ -335,45 +344,45 @@ class Flag extends ConfigEntityBundleBase implements FlagInterface {
    * {@inheritdoc}
    */
   public function getFlagTypePlugin() {
-    return $this->flagTypeCollection->get($this->flag_type);
+    return $this->flagTypeCollection->get($this->flagType);
   }
 
   /**
    * {@inheritdoc}
    */
   public function setFlagTypePlugin($plugin_id) {
-    $this->flag_type = $plugin_id;
+    $this->flagType = $plugin_id;
     // $this->flagTypeBag->addInstanceId($pluginID);
     // Workaround for https://www.drupal.org/node/2288805
     $this->flagTypeCollection = new DefaultSingleLazyPluginCollection(
       \Drupal::service('plugin.manager.flag.flagtype'),
-      $this->flag_type, $this->flagTypeConfig
+      $this->flagType, $this->flagTypeConfig
     );
 
     // Get the entity type from the plugin definition.
     $plugin = $this->getFlagTypePlugin();
     $plugin_def = $plugin->getPluginDefinition();
-    $this->entity_type = $plugin_def['entity_type'];
+    $this->entityType = $plugin_def['entity_type'];
   }
 
   /**
    * {@inheritdoc}
    */
   public function getLinkTypePlugin() {
-    return $this->linkTypeCollection->get($this->link_type);
+    return $this->linkTypeCollection->get($this->linkType);
   }
 
   /**
    * {@inheritdoc}
    */
   public function setlinkTypePlugin($plugin_id) {
-    $this->link_type = $plugin_id;
+    $this->linkType = $plugin_id;
 
     // $this->linkTypeBag->addInstanceId($pluginID);
     // Workaround for https://www.drupal.org/node/2288805
     $this->linkTypeCollection = new DefaultSingleLazyPluginCollection(
       \Drupal::service('plugin.manager.flag.linktype'),
-      $this->link_type, $this->linkTypeConfig
+      $this->linkType, $this->linkTypeConfig
     );
   }
 
@@ -429,98 +438,98 @@ class Flag extends ConfigEntityBundleBase implements FlagInterface {
    * {@inheritdoc}
    */
   public function setFlagShortText($text) {
-    $this->flag_short = $text;
+    $this->flagShort = $text;
   }
 
   /**
    * {@inheritdoc}
    */
   public function getFlagShortText() {
-    return $this->flag_short;
+    return $this->flagShort;
   }
 
   /**
    * {@inheritdoc}
    */
   public function getFlagLongText() {
-    return $this->flag_long;
+    return $this->flagLong;
   }
 
   /**
    * {@inheritdoc}
    */
   public function setFlagLongText($flag_long) {
-    $this->flag_long = $flag_long;
+    $this->flagLong = $flag_long;
   }
 
   /**
    * {@inheritdoc}
    */
   public function getFlagMessage() {
-    return $this->flag_message;
+    return $this->flagMessage;
   }
 
   /**
    * {@inheritdoc}
    */
   public function setFlagMessage($flag_message) {
-    $this->flag_message = $flag_message;
+    $this->flagMessage = $flag_message;
   }
 
   /**
    * {@inheritdoc}
    */
   public function getUnflagLongText() {
-    return $this->unflag_long;
+    return $this->unflagLong;
   }
 
   /**
    * {@inheritdoc}
    */
   public function setUnflagLongText($unflag_long) {
-    $this->unflag_long = $unflag_long;
+    $this->unflagLong = $unflag_long;
   }
 
   /**
    * {@inheritdoc}
    */
   public function getUnflagMessage() {
-    return $this->unflag_message;
+    return $this->unflagMessage;
   }
 
   /**
    * {@inheritdoc}
    */
   public function setUnflagMessage($unflag_message) {
-    $this->unflag_message = $unflag_message;
+    $this->unflagMessage = $unflag_message;
   }
 
   /**
    * {@inheritdoc}
    */
   public function getUnflagShortText() {
-    return $this->unflag_short;
+    return $this->unflagShort;
   }
 
   /**
    * {@inheritdoc}
    */
   public function setUnflagShortText($unflag_short) {
-    $this->unflag_short = $unflag_short;
+    $this->unflagShort = $unflag_short;
   }
 
   /**
    * {@inheritdoc}
    */
   public function getUnflagDeniedText() {
-    return $this->unflag_denied_text;
+    return $this->unflagDeniedText;
   }
 
   /**
    * {@inheritdoc}
    */
   public function setUnflagDeniedText($unflag_denied_text) {
-    $this->unflag_denied_text = $unflag_denied_text;
+    $this->unflagDeniedText = $unflag_denied_text;
   }
 
   /**
@@ -590,24 +599,4 @@ class Flag extends ConfigEntityBundleBase implements FlagInterface {
     return parent::sort($a, $b);
   }
 
-  /**
-   * {@inheritdoc}
-   */
-  public function toArray() {
-    // @todo Do we need Flag::toArray() any longer?
-    $properties = parent::toArray();
-    $names = [
-      'flag_type',
-      'link_type',
-      'flagTypeConfig',
-      'linkTypeConfig',
-    ];
-
-    foreach ($names as $name) {
-      $properties[$name] = $this->get($name);
-    }
-
-    return $properties;
-  }
-
 }
diff --git a/src/Tests/FlagCountsTest.php b/src/Tests/FlagCountsTest.php
index 7e77a4a..c18edd2 100644
--- a/src/Tests/FlagCountsTest.php
+++ b/src/Tests/FlagCountsTest.php
@@ -6,6 +6,7 @@
 
 namespace Drupal\flag\Tests;
 
+use Drupal\flag\Entity\Flag;
 use Drupal\node\Entity\Node;
 
 /**
@@ -110,6 +111,16 @@ class FlagCountsTest extends FlagTestBase {
     $this->assertEqual($flag_get_flag_counts, 0, "getFlagEntityCount() on reset flag returns the expected count.");
   }
 
+  public function testToArray() {
+    $id = 'test_1';
+    // Load the original configuration entity.
+    Flag::create(['id' => $id, 'flagShort' => 'TEST'])->save();
+    $entity = Flag::load($id);
+
+    $array = $entity->toArray();
+    $this->assertEqual($array['flagShort'], 'TEST', 'Found flagShort on newly created entity.');
+  }
+
   /**
    * Tests flaggings are deleted and counts are removed when a flag is deleted.
    */
diff --git a/src/Tests/FlagTestBase.php b/src/Tests/FlagTestBase.php
index 77def71..6c493be 100644
--- a/src/Tests/FlagTestBase.php
+++ b/src/Tests/FlagTestBase.php
@@ -93,11 +93,11 @@ abstract class FlagTestBase extends WebTestBase {
     $flag = Flag::create([
       'id' => strtolower($this->randomMachineName()),
       'label' => $this->randomString(),
-      'entity_type' => $entity_type,
+      'entityType' => $entity_type,
       'bundles' => $bundles,
-      'flag_short' => $this->t('Flag this item'),
-      'flag_type' => $this->getFlagType($entity_type),
-      'link_type' => $link_type,
+      'flagShort' => $this->t('Flag this item'),
+      'flagType' => $this->getFlagType($entity_type),
+      'linkType' => $link_type,
       'flagTypeConfig' => [],
       'linkTypeConfig' => [],
     ]);