Reverting some changes done in previous commit, they were not actually

needed

lib/Cake/ORM/Association.php

@@ -369,7 +369,7 @@ public function attachTo(Query $query, array $options = []) {
 		}
 
 		$joinOptions = ['table' => 1, 'conditions' => 1, 'type' => 1];
-		$query->join([$this->_name => array_intersect_key($options, $joinOptions)]);
+		$query->join([$target->alias() => array_intersect_key($options, $joinOptions)]);
 
 		if (empty($options['fields'])) {
 			$f = isset($options['fields']) ? $options['fields'] : null;
@@ -379,7 +379,7 @@ public function attachTo(Query $query, array $options = []) {
 		}
 
 		if (!empty($options['fields'])) {
-			$query->select($query->aliasFields($options['fields'], $this->_name));
+			$query->select($query->aliasFields($options['fields'], $target->alias()));
 		}
 	}
 
@@ -392,7 +392,8 @@ public function attachTo(Query $query, array $options = []) {
  */
 	public function transformRow($row) {
 		$sourceAlias = $this->source()->alias();
-		$row[$sourceAlias][$this->property()] = $row[$this->_name];
+		$targetAlias = $this->target()->alias();
+		$row[$sourceAlias][$this->property()] = $row[$targetAlias];
 		return $row;
 	}
 

lib/Cake/ORM/Association/BelongsTo.php

@@ -61,7 +61,7 @@ public function foreignKey($key = null) {
  */
 	protected function _joinCondition(array $options) {
 		return sprintf('%s.%s = %s.%s',
-				$this->_name,
+				$this->target()->alias(),
 				$this->_targetTable->primaryKey(),
 				$this->_sourceTable->alias(),
 				$options['foreignKey']

lib/Cake/ORM/Association/ExternalAssociationTrait.php

@@ -238,7 +238,6 @@ protected function _buildSubquery($query, $foreignKey) {
 				unset($joins[$i]);
 			}
 		}
-
 		$filterQuery->join($joins, [], true);
 		return $filterQuery->select($foreignKey, true);
 	}