diff --git a/CRM/TwingleCampaign/Form/Settings.php b/CRM/TwingleCampaign/Form/Settings.php
index 71a9033..8c57906 100644
--- a/CRM/TwingleCampaign/Form/Settings.php
+++ b/CRM/TwingleCampaign/Form/Settings.php
@@ -1,6 +1,6 @@
 <?php
 
-use CRM\TwingleCampaign\BAO\Configuration;
+use CRM_TwingleCampaign_BAO_Configuration as Configuration;
 use CRM_TwingleCampaign_ExtensionUtil as E;
 
 include_once E::path() . '/CRM/TwingleCampaign/BAO/Configuration.php';
diff --git a/CRM/TwingleCampaign/Upgrader.php b/CRM/TwingleCampaign/Upgrader.php
index 13c9f75..2bfc993 100644
--- a/CRM/TwingleCampaign/Upgrader.php
+++ b/CRM/TwingleCampaign/Upgrader.php
@@ -1,18 +1,12 @@
 <?php
 
-use CRM\TwingleCampaign\BAO\CampaignType;
-use CRM\TwingleCampaign\BAO\CustomField;
-use CRM\TwingleCampaign\BAO\CustomGroup;
-use CRM\TwingleCampaign\BAO\Configuration;
-use CRM\TwingleCampaign\Utils\ExtensionCache;
+use CRM_TwingleCampaign_BAO_CampaignType as CampaignType;
+use CRM_TwingleCampaign_BAO_CustomField as CustomField;
+use CRM_TwingleCampaign_BAO_CustomGroup as CustomGroup;
+use CRM_TwingleCampaign_BAO_Configuration as Configuration;
+use CRM_TwingleCampaign_Utils_ExtensionCache as Cache;
 use CRM_TwingleCampaign_ExtensionUtil as E;
 
-include_once E::path() . '/CRM/TwingleCampaign/BAO/CampaignType.php';
-include_once E::path() . '/CRM/TwingleCampaign/BAO/CustomField.php';
-include_once E::path() . '/CRM/TwingleCampaign/BAO/CustomGroup.php';
-include_once E::path() . '/CRM/TwingleCampaign/BAO/Configuration.php';
-include_once E::path() . '/CRM/TwingleCampaign/Utils/ExtensionCache.php';
-
 /**
  * Collection of upgrade steps.
  */
diff --git a/CRM/TwingleCampaign/Utils/ExtensionCache.php b/CRM/TwingleCampaign/Utils/ExtensionCache.php
index c25f4c9..dc2e7f8 100644
--- a/CRM/TwingleCampaign/Utils/ExtensionCache.php
+++ b/CRM/TwingleCampaign/Utils/ExtensionCache.php
@@ -3,7 +3,6 @@
 use CRM_TwingleCampaign_BAO_CustomField as CustomField;
 use CRM_TwingleCampaign_ExtensionUtil as E;
 
-include_once E::path() . '/CRM/TwingleCampaign/BAO/CustomField.php';
 
 /**
  * A singleton that caches mappings and settings
@@ -24,7 +23,7 @@ class CRM_TwingleCampaign_Utils_ExtensionCache {
 
   /**
    * Get an instance (singleton)
-   * @return ExtensionCache|null
+   * @return self|null
    */
   public static function getInstance() {
     if (null === self::$_instance) {