diff --git a/CRM/Report/Form.php b/CRM/Report/Form.php
index 21ce429bb87f..3a006244fb2c 100644
--- a/CRM/Report/Form.php
+++ b/CRM/Report/Form.php
@@ -4312,7 +4312,7 @@ public function fiscalYearOffset($fieldName) {
    * @param array $extra Additional options.
    *      Not currently used in core but may be used in override extensions.
    */
-  public function addAddressFromClause($prefix = '', $extra = array()) {
+  public function joinAddressFromContact($prefix = '', $extra = array()) {
     // include address field if address column is to be included
     if ((isset($this->_addressField) && $this->_addressField) || $this->isTableSelected($prefix . 'civicrm_address')) {
       $this->_from .= "
@@ -4333,7 +4333,7 @@ public function addAddressFromClause($prefix = '', $extra = array()) {
    * @param array $extra Additional options.
    *      Not currently used in core but may be used in override extensions.
    */
-  public function addCountryFromClause($prefix = '', $extra = array()) {
+  public function joinCountryFromClause($prefix = '', $extra = array()) {
     // include country field if country column is to be included
     if ($this->isTableSelected($prefix . 'civicrm_country')) {
       $this->_from .= "
@@ -4353,7 +4353,7 @@ public function addCountryFromClause($prefix = '', $extra = array()) {
    * @param array $extra Additional options.
    *      Not currently used in core but may be used in override extensions.
    */
-  public function addPhoneFromClause($prefix = '', $extra = array()) {
+  public function joinPhoneFromClause($prefix = '', $extra = array()) {
     // include phone field if phone column is to be included
     if ($this->isTableSelected($prefix . 'civicrm_phone')) {
       $this->_from .= "
@@ -4373,7 +4373,7 @@ public function addPhoneFromClause($prefix = '', $extra = array()) {
    * @param array $extra Additional options.
    *      Not currently used in core but may be used in override extensions.
    */
-  public function addEmailFromClause($prefix = '', $extra = array()) {
+  public function joinEmailFromClause($prefix = '', $extra = array()) {
     // include email field if email column is to be included
     if ($this->isTableSelected($prefix . 'civicrm_email')) {
       $this->_from .= "
diff --git a/CRM/Report/Form/Activity.php b/CRM/Report/Form/Activity.php
index e024ba937e62..098b4229da91 100644
--- a/CRM/Report/Form/Activity.php
+++ b/CRM/Report/Form/Activity.php
@@ -582,7 +582,7 @@ public function from($recordType) {
       $this->_aliases['civicrm_contact'] = 'civicrm_contact_source';
     }
 
-    $this->addAddressFromClause();
+    $this->joinAddressFromClause();
   }
 
   /**
diff --git a/CRM/Report/Form/ActivitySummary.php b/CRM/Report/Form/ActivitySummary.php
index 00a66e88b982..e933d084a9eb 100644
--- a/CRM/Report/Form/ActivitySummary.php
+++ b/CRM/Report/Form/ActivitySummary.php
@@ -337,7 +337,7 @@ public function from($durationMode = FALSE) {
                LEFT JOIN civicrm_case_contact
                       ON civicrm_case_contact.case_id = civicrm_case.id ";
 
-      $this->addPhoneFromClause();
+      $this->joinPhoneFromClause();
     }
     else {
       $this->_from = "
@@ -350,7 +350,7 @@ public function from($durationMode = FALSE) {
               {$this->_aclFrom}";
     }
 
-    $this->addEmailFromClause();
+    $this->joinEmailFromClause();
   }
 
   /**
diff --git a/CRM/Report/Form/Campaign/SurveyDetails.php b/CRM/Report/Form/Campaign/SurveyDetails.php
index 5c9d5beef90c..94b41a0b338b 100644
--- a/CRM/Report/Form/Campaign/SurveyDetails.php
+++ b/CRM/Report/Form/Campaign/SurveyDetails.php
@@ -291,9 +291,9 @@ public function from() {
     $this->_from .= " INNER JOIN civicrm_activity_contact activity_contact_civireport ON
                       ( {$this->_aliases['civicrm_activity']}.id = activity_contact_civireport.activity_id  AND activity_contact_civireport.record_type_id = {$assigneeID} )\n";
 
-    $this->addAddressFromClause();
-    $this->addPhoneFromClause();
-    $this->addEmailFromClause();
+    $this->joinAddressFromClause();
+    $this->joinPhoneFromClause();
+    $this->joinEmailFromClause();
 
     if ($this->_locationBasedPhoneField) {
       foreach ($this->_surveyResponseFields as $key => $value) {
diff --git a/CRM/Report/Form/Case/Demographics.php b/CRM/Report/Form/Case/Demographics.php
index 81472d971517..e49f372a3298 100644
--- a/CRM/Report/Form/Case/Demographics.php
+++ b/CRM/Report/Form/Case/Demographics.php
@@ -313,8 +313,8 @@ public function from() {
       }
     }
 
-    $this->addPhoneFromClause();
-    $this->addEmailFromClause();
+    $this->joinPhoneFromClause();
+    $this->joinEmailFromClause();
 
   }
 
diff --git a/CRM/Report/Form/Case/Detail.php b/CRM/Report/Form/Case/Detail.php
index 0d2c527c5ddc..ae4d2eaca152 100644
--- a/CRM/Report/Form/Case/Detail.php
+++ b/CRM/Report/Form/Case/Detail.php
@@ -414,9 +414,9 @@ public function from() {
 ";
     }
 
-    $this->addAddressFromClause();
-    $this->addPhoneFromClause();
-    $this->addEmailFromClause();
+    $this->joinAddressFromClause();
+    $this->joinPhoneFromClause();
+    $this->joinEmailFromClause();
 
     if ($this->_worldRegionField) {
       $this->_from .= "
diff --git a/CRM/Report/Form/Contact/CurrentEmployer.php b/CRM/Report/Form/Contact/CurrentEmployer.php
index 39dfd7b882af..382dc4a17910 100644
--- a/CRM/Report/Form/Contact/CurrentEmployer.php
+++ b/CRM/Report/Form/Contact/CurrentEmployer.php
@@ -254,9 +254,9 @@ public function from() {
               AND {$this->_aliases['civicrm_relationship']}.contact_id_b={$this->_aliases['civicrm_contact']}.employer_id
               AND {$this->_aliases['civicrm_relationship']}.relationship_type_id={$relType})  ";
 
-    $this->addAddressFromClause();
-    $this->addPhoneFromClause();
-    $this->addEmailFromClause();
+    $this->joinAddressFromClause();
+    $this->joinPhoneFromClause();
+    $this->joinEmailFromClause();
   }
 
   public function where() {
diff --git a/CRM/Report/Form/Contact/Detail.php b/CRM/Report/Form/Contact/Detail.php
index aacc6e5141a8..092f827a96d4 100644
--- a/CRM/Report/Form/Contact/Detail.php
+++ b/CRM/Report/Form/Contact/Detail.php
@@ -463,10 +463,10 @@ public function from() {
     $this->_from = "
         FROM civicrm_contact {$this->_aliases['civicrm_contact']} {$this->_aclFrom}";
 
-    $this->addAddressFromClause();
-    $this->addCountryFromClause();
-    $this->addPhoneFromClause();
-    $this->addEmailFromClause();
+    $this->joinAddressFromClause();
+    $this->joinCountryFromClause();
+    $this->joinPhoneFromClause();
+    $this->joinEmailFromClause();
 
     $this->_from .= "{$group}";
 
diff --git a/CRM/Report/Form/Contact/Summary.php b/CRM/Report/Form/Contact/Summary.php
index 2012f5348ad1..ab3e48b23abd 100644
--- a/CRM/Report/Form/Contact/Summary.php
+++ b/CRM/Report/Form/Contact/Summary.php
@@ -192,10 +192,10 @@ public function from() {
             LEFT JOIN civicrm_address {$this->_aliases['civicrm_address']}
                    ON ({$this->_aliases['civicrm_contact']}.id = {$this->_aliases['civicrm_address']}.contact_id AND
                       {$this->_aliases['civicrm_address']}.is_primary = 1 ) ";
-
-    $this->addPhoneFromClause();
-    $this->addEmailFromClause();
-    $this->addCountryFromClause();
+                      
+    $this->joinPhoneFromClause();
+    $this->joinEmailFromClause();
+    $this->joinCountryFromClause();
   }
 
   public function postProcess() {
diff --git a/CRM/Report/Form/Contribute/Detail.php b/CRM/Report/Form/Contribute/Detail.php
index e67e0d0b4424..ff2596d56e37 100644
--- a/CRM/Report/Form/Contribute/Detail.php
+++ b/CRM/Report/Form/Contribute/Detail.php
@@ -941,16 +941,10 @@ public function appendAdditionalFromJoins() {
               INNER JOIN (SELECT c.id, IF(COUNT(oc.id) = 0, 0, 1) AS ordinality FROM civicrm_contribution c LEFT JOIN civicrm_contribution oc ON c.contact_id = oc.contact_id AND oc.receive_date < c.receive_date GROUP BY c.id) {$this->_aliases['civicrm_contribution_ordinality']}
                       ON {$this->_aliases['civicrm_contribution_ordinality']}.id = {$this->_aliases['civicrm_contribution']}.id";
     }
-    $this->addPhoneFromClause();
+    $this->joinPhoneFromClause();
+    $this->joinAddressFromClause();
+    $this->joinEmailFromClause();
 
-    $this->addAddressFromClause();
-
-    if ($this->_emailField) {
-      $this->_from .= "
-            LEFT JOIN civicrm_email {$this->_aliases['civicrm_email']}
-                   ON {$this->_aliases['civicrm_contact']}.id = {$this->_aliases['civicrm_email']}.contact_id AND
-                      {$this->_aliases['civicrm_email']}.is_primary = 1\n";
-    }
     // include contribution note
     if (!empty($this->_params['fields']['contribution_note']) ||
       !empty($this->_params['note_value'])
diff --git a/CRM/Report/Form/Contribute/History.php b/CRM/Report/Form/Contribute/History.php
index 346e526896d9..e0dada5fdf41 100644
--- a/CRM/Report/Form/Contribute/History.php
+++ b/CRM/Report/Form/Contribute/History.php
@@ -402,9 +402,9 @@ public function from() {
     $this->_relationshipFrom = " INNER JOIN civicrm_relationship {$this->_aliases['civicrm_relationship']}
                      ON (({$this->_aliases['civicrm_relationship']}.contact_id_a = {$relContacAlias}.id OR {$this->_aliases['civicrm_relationship']}.contact_id_b = {$relContacAlias}.id ) AND {$this->_aliases['civicrm_relationship']}.is_active = 1) ";
 
-    $this->addAddressFromClause();
-    $this->addPhoneFromClause();
-    $this->addEmailFromClause();
+    $this->joinAddressFromClause();
+    $this->joinPhoneFromClause();
+    $this->joinEmailFromClause();
 
     // for credit card type
     $this->addFinancialTrxnFromClause();
diff --git a/CRM/Report/Form/Contribute/Lybunt.php b/CRM/Report/Form/Contribute/Lybunt.php
index e4db898da561..35a621f918e9 100644
--- a/CRM/Report/Form/Contribute/Lybunt.php
+++ b/CRM/Report/Form/Contribute/Lybunt.php
@@ -346,9 +346,9 @@ public function from() {
         INNER JOIN civicrm_contact {$this->_aliases['civicrm_contact']}
           ON restricted_contacts.cid = {$this->_aliases['civicrm_contact']}.id";
 
-      $this->addAddressFromClause();
-      $this->addPhoneFromClause();
-      $this->addEmailFromClause();
+      $this->joinAddressFromClause();
+      $this->joinPhoneFromClause();
+      $this->joinEmailFromClause();
     }
     else {
       $this->setFromBase('civicrm_contact');
diff --git a/CRM/Report/Form/Contribute/Recur.php b/CRM/Report/Form/Contribute/Recur.php
index fda2d247e787..614eefeecf42 100644
--- a/CRM/Report/Form/Contribute/Recur.php
+++ b/CRM/Report/Form/Contribute/Recur.php
@@ -274,8 +274,8 @@ public function from() {
       LEFT JOIN civicrm_contribution  {$this->_aliases['civicrm_contribution']}
         ON {$this->_aliases['civicrm_contribution_recur']}.id = {$this->_aliases['civicrm_contribution']}.contribution_recur_id";
 
-    $this->addPhoneFromClause();
-    $this->addEmailFromClause();
+    $this->joinPhoneFromClause();
+    $this->joinEmailFromClause();
 
     // for credit card type
     $this->addFinancialTrxnFromClause();
diff --git a/CRM/Report/Form/Contribute/Summary.php b/CRM/Report/Form/Contribute/Summary.php
index 5e8dca2a633a..6b9928db3061 100644
--- a/CRM/Report/Form/Contribute/Summary.php
+++ b/CRM/Report/Form/Contribute/Summary.php
@@ -517,9 +517,9 @@ public function from($entity = NULL) {
                      ON {$this->_aliases['civicrm_contribution']}.financial_type_id ={$this->_aliases['civicrm_financial_type']}.id
              ";
 
-    $this->addAddressFromClause();
-    $this->addPhoneFromClause();
-    $this->addEmailFromClause();
+    $this->joinAddressFromClause();
+    $this->joinPhoneFromClause();
+    $this->joinEmailFromClause();
 
     //for contribution batches
     if ($this->isTableSelected('civicrm_batch')) {
diff --git a/CRM/Report/Form/Contribute/Sybunt.php b/CRM/Report/Form/Contribute/Sybunt.php
index 2e03fad1e761..f4f0ab42bda6 100644
--- a/CRM/Report/Form/Contribute/Sybunt.php
+++ b/CRM/Report/Form/Contribute/Sybunt.php
@@ -352,13 +352,13 @@ public function from() {
                       ON {$this->_aliases['civicrm_contact']}.id = {$this->_aliases['civicrm_contribution']}.contact_id
              {$this->_aclFrom}";
 
-    $this->addPhoneFromClause();
-    $this->addEmailFromClause();
+    $this->joinPhoneFromClause();
+    $this->joinEmailFromClause();
 
     // for credit card type
     $this->addFinancialTrxnFromClause();
 
-    $this->addAddressFromClause();
+    $this->joinAddressFromClause();
   }
 
   public function where() {
diff --git a/CRM/Report/Form/Contribute/TopDonor.php b/CRM/Report/Form/Contribute/TopDonor.php
index 606b80d006fa..10f163b26f18 100644
--- a/CRM/Report/Form/Contribute/TopDonor.php
+++ b/CRM/Report/Form/Contribute/TopDonor.php
@@ -258,9 +258,9 @@ public function from() {
     // for credit card type
     $this->addFinancialTrxnFromClause();
 
-    $this->addAddressFromClause();
-    $this->addPhoneFromClause();
-    $this->addEmailFromClause();
+    $this->joinAddressFromClause();
+    $this->joinPhoneFromClause();
+    $this->joinEmailFromClause();
   }
 
   public function where() {
diff --git a/CRM/Report/Form/Event/ParticipantListCount.php b/CRM/Report/Form/Event/ParticipantListCount.php
index 1646c6e04141..4d57626ff6a1 100644
--- a/CRM/Report/Form/Event/ParticipantListCount.php
+++ b/CRM/Report/Form/Event/ParticipantListCount.php
@@ -465,9 +465,9 @@ public function from() {
          LEFT JOIN civicrm_line_item {$this->_aliases['civicrm_line_item']}
               ON {$this->_aliases['civicrm_line_item']}.entity_table = 'civicrm_participant' AND {$this->_aliases['civicrm_participant']}.id ={$this->_aliases['civicrm_line_item']}.entity_id";
 
-    $this->addAddressFromClause();
-    $this->addPhoneFromClause();
-    $this->addEmailFromClause();
+    $this->joinAddressFromClause();
+    $this->joinPhoneFromClause();
+    $this->joinEmailFromClause();
   }
 
   public function storeWhereHavingClauseArray() {
diff --git a/CRM/Report/Form/Event/ParticipantListing.php b/CRM/Report/Form/Event/ParticipantListing.php
index 22804f197700..64e9a4454fdf 100644
--- a/CRM/Report/Form/Event/ParticipantListing.php
+++ b/CRM/Report/Form/Event/ParticipantListing.php
@@ -515,9 +515,9 @@ public function from() {
              {$this->_aclFrom}
       ";
 
-    $this->addAddressFromClause();
-    $this->addPhoneFromClause();
-    $this->addEmailFromClause();
+    $this->joinAddressFromClause();
+    $this->joinPhoneFromClause();
+    $this->joinEmailFromClause();
 
     if ($this->_contribField) {
       $this->_from .= "
diff --git a/CRM/Report/Form/Grant/Statistics.php b/CRM/Report/Form/Grant/Statistics.php
index 1a7f4a34c508..8cd45a0bd4ae 100644
--- a/CRM/Report/Form/Grant/Statistics.php
+++ b/CRM/Report/Form/Grant/Statistics.php
@@ -242,8 +242,8 @@ public function from() {
                         LEFT JOIN civicrm_contact {$this->_aliases['civicrm_contact']}
                     ON ({$this->_aliases['civicrm_grant']}.contact_id  = {$this->_aliases['civicrm_contact']}.id  ) ";
 
-    $this->addAddressFromClause();
-    $this->addCountryFromClause();
+    $this->joinAddressFromClause();
+    $this->joinCountryFromClause();
     if ($this->_addressField) {
       $this->_from .= "
                   LEFT JOIN civicrm_worldregion {$this->_aliases['civicrm_world_region']}
diff --git a/CRM/Report/Form/Mailing/Bounce.php b/CRM/Report/Form/Mailing/Bounce.php
index aad5722f306c..9b65c2bffc31 100644
--- a/CRM/Report/Form/Mailing/Bounce.php
+++ b/CRM/Report/Form/Mailing/Bounce.php
@@ -337,8 +337,7 @@ public function from() {
         INNER JOIN civicrm_mailing {$this->_aliases['civicrm_mailing']}
           ON civicrm_mailing_job.mailing_id = {$this->_aliases['civicrm_mailing']}.id
       ";
-
-    $this->addPhoneFromClause();
+    $this->joinPhoneFromClause();
   }
 
   public function where() {
diff --git a/CRM/Report/Form/Mailing/Clicks.php b/CRM/Report/Form/Mailing/Clicks.php
index f6a61a872b1a..5e731797c259 100644
--- a/CRM/Report/Form/Mailing/Clicks.php
+++ b/CRM/Report/Form/Mailing/Clicks.php
@@ -293,7 +293,7 @@ public function from() {
         ON civicrm_mailing_job.mailing_id = {$this->_aliases['civicrm_mailing']}.id
         AND civicrm_mailing_job.is_test = 0
     ";
-    $this->addPhoneFromClause();
+    $this->joinPhoneFromClause();
   }
 
   public function where() {
diff --git a/CRM/Report/Form/Mailing/Detail.php b/CRM/Report/Form/Mailing/Detail.php
index 902f7ff514dc..6ff146876983 100644
--- a/CRM/Report/Form/Mailing/Detail.php
+++ b/CRM/Report/Form/Mailing/Detail.php
@@ -443,7 +443,7 @@ public function from() {
           ON civicrm_mailing_job.mailing_id = {$this->_aliases['civicrm_mailing']}.id
           AND civicrm_mailing_job.is_test = 0";
 
-    $this->addPhoneFromClause();
+    $this->joinPhoneFromClause();
   }
 
   public function where() {
diff --git a/CRM/Report/Form/Mailing/Opened.php b/CRM/Report/Form/Mailing/Opened.php
index b7f9fd0f767f..bf90b04dad2d 100644
--- a/CRM/Report/Form/Mailing/Opened.php
+++ b/CRM/Report/Form/Mailing/Opened.php
@@ -279,7 +279,7 @@ public function from() {
         ON civicrm_mailing_job.mailing_id = {$this->_aliases['civicrm_mailing']}.id
         AND civicrm_mailing_job.is_test = 0
     ";
-    $this->addPhoneFromClause();
+    $this->joinPhoneFromClause();
   }
 
   public function where() {
diff --git a/CRM/Report/Form/Member/ContributionDetail.php b/CRM/Report/Form/Member/ContributionDetail.php
index f9520613be52..4bf8d703d720 100644
--- a/CRM/Report/Form/Member/ContributionDetail.php
+++ b/CRM/Report/Form/Member/ContributionDetail.php
@@ -522,9 +522,9 @@ public function from() {
           AND {$this->_aliases['civicrm_batch']}.entity_table = 'civicrm_financial_trxn')";
     }
 
-    $this->addAddressFromClause();
-    $this->addPhoneFromClause();
-    $this->addEmailFromClause();
+    $this->joinAddressFromClause();
+    $this->joinPhoneFromClause();
+    $this->joinEmailFromClause();
   }
 
   /**
diff --git a/CRM/Report/Form/Member/Detail.php b/CRM/Report/Form/Member/Detail.php
index 2ff8759737b6..4f568957d7b7 100644
--- a/CRM/Report/Form/Member/Detail.php
+++ b/CRM/Report/Form/Member/Detail.php
@@ -284,9 +284,9 @@ public function from() {
                           ON {$this->_aliases['civicrm_membership_status']}.id =
                              {$this->_aliases['civicrm_membership']}.status_id ";
 
-    $this->addAddressFromClause();
-    $this->addPhoneFromClause();
-    $this->addEmailFromClause();
+    $this->joinAddressFromClause();
+    $this->joinPhoneFromClause();
+    $this->joinEmailFromClause();
 
     //used when contribution field is selected.
     if ($this->isTableSelected('civicrm_contribution')) {
diff --git a/CRM/Report/Form/Member/Lapse.php b/CRM/Report/Form/Member/Lapse.php
index 32622f06bcaa..7b1ead77f9f8 100644
--- a/CRM/Report/Form/Member/Lapse.php
+++ b/CRM/Report/Form/Member/Lapse.php
@@ -260,9 +260,9 @@ public function from() {
                          ON {$this->_aliases['civicrm_membership']}.membership_type_id =
                             {$this->_aliases['civicrm_membership_type']}.id";
 
-    $this->addAddressFromClause();
-    $this->addPhoneFromClause();
-    $this->addEmailFromClause();
+    $this->joinAddressFromClause();
+    $this->joinPhoneFromClause();
+    $this->joinEmailFromClause();
   }
 
   public function where() {
diff --git a/CRM/Report/Form/Pledge/Detail.php b/CRM/Report/Form/Pledge/Detail.php
index d32a458cbf82..fbbd243bad68 100644
--- a/CRM/Report/Form/Pledge/Detail.php
+++ b/CRM/Report/Form/Pledge/Detail.php
@@ -286,9 +286,9 @@ public function from() {
       ";
     }
 
-    $this->addPhoneFromClause();
-    $this->addAddressFromClause();
-    $this->addEmailFromClause();
+    $this->joinPhoneFromClause();
+    $this->joinAddressFromClause();
+    $this->joinEmailFromClause();
   }
 
   /**
diff --git a/CRM/Report/Form/Walklist/Walklist.php b/CRM/Report/Form/Walklist/Walklist.php
index 65ff2be3ffe5..49cd73da99cd 100644
--- a/CRM/Report/Form/Walklist/Walklist.php
+++ b/CRM/Report/Form/Walklist/Walklist.php
@@ -184,9 +184,9 @@ public function from() {
 FROM       civicrm_contact {$this->_aliases['civicrm_contact']} {$this->_aclFrom}
 ";
 
-    $this->addAddressFromClause();
-    $this->addPhoneFromClause();
-    $this->addEmailFromClause();
+    $this->joinAddressFromClause();
+    $this->joinPhoneFromClause();
+    $this->joinEmailFromClause();
   }
 
   public function where() {