diff --git a/CRM/TwingleCampaign/BAO/Campaign.php b/CRM/TwingleCampaign/BAO/Campaign.php
index f88bdc2..2430e3e 100644
--- a/CRM/TwingleCampaign/BAO/Campaign.php
+++ b/CRM/TwingleCampaign/BAO/Campaign.php
@@ -43,7 +43,8 @@ abstract class CRM_TwingleCampaign_BAO_Campaign {
    */
   protected function __construct(array $campaign, string $origin) {
 
-    $this->className = get_class($this);
+    $className = explode('_', get_class($this));
+    $this->className = array_pop($className);
 
     // If values come from CiviCRM Campaign API
     if ($origin == self::CIVICRM) {
diff --git a/CRM/TwingleCampaign/BAO/TwingleEvent.php b/CRM/TwingleCampaign/BAO/TwingleEvent.php
index bcd43b5..4877c94 100644
--- a/CRM/TwingleCampaign/BAO/TwingleEvent.php
+++ b/CRM/TwingleCampaign/BAO/TwingleEvent.php
@@ -23,7 +23,8 @@ class CRM_TwingleCampaign_BAO_TwingleEvent extends Campaign {
   protected function __construct(array $event, string $origin) {
     parent::__construct($event, $origin);
 
-    $this->className = (new ReflectionClass($this))->getShortName();
+    $className = explode('_', (new ReflectionClass($this))->getShortName());
+    $this->className = array_pop($className);;
     $this->prefix = 'twingle_event_';
     $this->values['campaign_type_id'] = 'twingle_event';
     $this->id_custom_field = Cache::getInstance()
diff --git a/CRM/TwingleCampaign/BAO/TwingleProject.php b/CRM/TwingleCampaign/BAO/TwingleProject.php
index 8ef3500..16299e6 100644
--- a/CRM/TwingleCampaign/BAO/TwingleProject.php
+++ b/CRM/TwingleCampaign/BAO/TwingleProject.php
@@ -19,10 +19,11 @@ class CRM_TwingleCampaign_BAO_TwingleProject extends Campaign {
    *
    * @throws Exception
    */
-  protected function __construct(array $project, string $origin) {
+  function __construct(array $project, string $origin) {
     parent::__construct($project, $origin);
 
-    $this->className = (new ReflectionClass($this))->getShortName();
+    $className = explode('_', (new ReflectionClass($this))->getShortName());
+    $this->className = array_pop($className);;
     $this->prefix = 'twingle_project_';
     $this->values['campaign_type_id'] = 'twingle_project';
     $this->id_custom_field = Cache::getInstance()