Basing target enumerable variable name on variable type not target type

Author: SteveWilkes

AgileMapper/ObjectPopulation/EnumerablePopulationBuilder.cs

@@ -59,7 +59,6 @@ public EnumerablePopulationBuilder(ObjectMapperData omd)
 
             _sourceElementParameter = _sourceElementType.GetOrCreateParameter();
             var sourceElementId = GetIdentifierOrNull(_sourceElementType, _sourceElementParameter, omd, typeIdsCache);
-            string targetVariableName;
 
             if (ElementTypesAreTheSame)
             {
@@ -68,7 +67,6 @@ public EnumerablePopulationBuilder(ObjectMapperData omd)
                         GetSourceElementIdLambda(_sourceElementParameter, sourceElementId, sourceElementId);
 
                 _sourceVariableName = "source" + omd.SourceType.GetVariableNameInPascalCase();
-                targetVariableName = "target" + omd.TargetType.GetVariableNameInPascalCase();
             }
             else
             {
@@ -78,11 +76,10 @@ public EnumerablePopulationBuilder(ObjectMapperData omd)
                 _targetElementIdLambda = GetTargetElementIdLambda(targetElementParameter, targetElementId);
 
                 _sourceVariableName = omd.SourceType.GetVariableNameInCamelCase();
-                targetVariableName = omd.TargetType.GetVariableNameInCamelCase();
             }
 
             _discardExistingValues = omd.RuleSet.EnumerablePopulationStrategy.DiscardExistingValues;
-            TargetVariable = GetTargetVariable(targetVariableName);
+            TargetVariable = GetTargetVariable();
 
             _populationExpressions = new List<Expression>();
         }
@@ -145,7 +142,7 @@ private static LambdaExpression GetTargetElementIdLambda(ParameterExpression tar
                 targetElement);
         }
 
-        private ParameterExpression GetTargetVariable(string name)
+        private ParameterExpression GetTargetVariable()
         {
             Type targetVariableType;
 
@@ -164,6 +161,10 @@ private ParameterExpression GetTargetVariable(string name)
                 targetVariableType = _omd.TargetType;
             }
 
+            var name = ElementTypesAreTheSame
+                ? "target" + targetVariableType.GetVariableNameInPascalCase()
+                : targetVariableType.GetVariableNameInCamelCase();
+
             return Expression.Variable(targetVariableType, name);
         }
 
@@ -358,8 +359,8 @@ public void AddNewItemsToTargetVariable(IObjectMappingData enumerableMappingData
             {
                 loopExitCheck = Expression.Equal(Counter, GetCountPropertyAccess());
 
-                if (ElementTypesAreSimple || 
-                    _sourceTypeHelper.ElementType.RuntimeTypeNeeded() || 
+                if (ElementTypesAreSimple ||
+                    _sourceTypeHelper.ElementType.RuntimeTypeNeeded() ||
                     _targetElementType.RuntimeTypeNeeded())
                 {
                     populationLoopAdapter = exp => exp;