diff --git a/ProjectR/Builders/CodeBuilder.cs b/ProjectR/Builders/CodeBuilder.cs
index 1d0aa8f..83866ce 100644
--- a/ProjectR/Builders/CodeBuilder.cs
+++ b/ProjectR/Builders/CodeBuilder.cs
@@ -91,6 +91,8 @@ private void BuildConstructorAndFields(string className, HashSet<INamedTypeSymbo
 
         private void BuildProjectAsMethod(INamedTypeSymbol mapperSymbol, MappingPlan plan)
         {
+            // For Project: plan.SourceType = Entity, plan.DestinationType = DTO
+            // Generates: TDto Project(TEntity source)
             var sourceTypeName = plan.SourceType.ToDisplayString();
             var destTypeName = plan.DestinationType.ToDisplayString();
             BuildXmlDoc(mapperSymbol, "Project");
@@ -106,6 +108,8 @@ private void BuildProjectAsMethod(INamedTypeSymbol mapperSymbol, MappingPlan pla
 
         private void BuildBuildMethod(INamedTypeSymbol mapperSymbol, MappingPlan plan)
         {
+            // For Build: plan.SourceType = DTO, plan.DestinationType = Entity
+            // Generates: TEntity Build(TDto source)
             var sourceTypeName = plan.SourceType.ToDisplayString();
             var destTypeName = plan.DestinationType.ToDisplayString();
             BuildXmlDoc(mapperSymbol, "Build");
diff --git a/ProjectR/Mapping/MapperGenerator.cs b/ProjectR/Mapping/MapperGenerator.cs
index 0fd0253..f3f463c 100644
--- a/ProjectR/Mapping/MapperGenerator.cs
+++ b/ProjectR/Mapping/MapperGenerator.cs
@@ -161,13 +161,14 @@ private static void ProcessMapperClass(Compilation compilation, ClassDeclaration
             var baseType = mapperSymbol.BaseType;
             if (baseType == null || baseType.TypeArguments.Length != 2) return;
 
-            var sourceType = baseType.TypeArguments[0];
-            var destinationType = baseType.TypeArguments[1];
+            // Mapper<TEntity, TDto> type arguments
+            var entityType = baseType.TypeArguments[0];  // TEntity
+            var dtoType = baseType.TypeArguments[1];     // TDto
 
             var allUsings = new HashSet<string>();
             CollectUsings(mapperSymbol, allUsings);
-            CollectUsings(sourceType, allUsings);
-            CollectUsings(destinationType, allUsings);
+            CollectUsings(entityType, allUsings);
+            CollectUsings(dtoType, allUsings);
 
             var policyMethodSyntax = mapperSymbol.GetMembers("ConfigureMappingPolicies")
                 .FirstOrDefault(m => m.IsStatic && !m.IsImplicitlyDeclared)?
@@ -176,9 +177,12 @@ private static void ProcessMapperClass(Compilation compilation, ClassDeclaration
             // Use the provided compilation which includes placeholders
             var engine = new PolicyEngine(compilation, policyMethodSyntax, allMappers);
 
-            var projectAsPlan = engine.CreateProjectAsPlan(sourceType, destinationType);
-            var buildPlan = engine.CreateBuildPlan(destinationType, sourceType);
-            var applyToPlan = engine.CreateApplyToPlan(destinationType, sourceType);
+            // Project: Entity -> DTO
+            var projectAsPlan = engine.CreateProjectAsPlan(entityType, dtoType);
+            // Build: DTO -> Entity
+            var buildPlan = engine.CreateBuildPlan(dtoType, entityType);
+            // ApplyTo: DTO -> Entity (modification)
+            var applyToPlan = engine.CreateApplyToPlan(dtoType, entityType);
 
             projectAsPlan.Diagnostics.ForEach(context.ReportDiagnostic);
             buildPlan.Diagnostics.ForEach(context.ReportDiagnostic);
diff --git a/ProjectR/Policies/Policies.cs b/ProjectR/Policies/Policies.cs
index 24699cd..9060f5c 100644
--- a/ProjectR/Policies/Policies.cs
+++ b/ProjectR/Policies/Policies.cs
@@ -21,12 +21,12 @@ public interface IPolicyConfiguration
         /// <summary>
         /// Configures the policy for the Build(TDto) method.
         /// </summary>
-        IBuildPolicyBuilder<TDestination, TSource> ForCreation<TDestination, TSource>();
+        IBuildPolicyBuilder<TSource, TDestination> ForCreation<TSource, TDestination>();
 
         /// <summary>
         /// Configures the policy for the Apply(TDto, TEntity) method.
         /// </summary>
-        IApplyToPolicyBuilder<TDestination, TSource> ForModification<TDestination, TSource>();
+        IApplyToPolicyBuilder<TSource, TDestination> ForModification<TSource, TDestination>();
     }
 
     // NUOVA INTERFACCIA DI BASE PER LE CONFIGURAZIONI A LIVELLO DI PROPRIETÀ
diff --git a/ProjectR/Policies/PoliciesApiInternal.cs b/ProjectR/Policies/PoliciesApiInternal.cs
index f39a800..c6d38a7 100644
--- a/ProjectR/Policies/PoliciesApiInternal.cs
+++ b/ProjectR/Policies/PoliciesApiInternal.cs
@@ -15,14 +15,14 @@ public IProjectAsPolicyBuilder<TSource, TDestination> ForProjection<TSource, TDe
             return new ProjectAsPolicyBuilder<TSource, TDestination>();
         }
 
-        public IBuildPolicyBuilder<TDestination, TSource> ForCreation<TDestination, TSource>()
+        public IBuildPolicyBuilder<TSource, TDestination> ForCreation<TSource, TDestination>()
         {
-            return new BuildPolicyBuilder<TDestination, TSource>();
+            return new BuildPolicyBuilder<TSource, TDestination>();
         }
 
-        public IApplyToPolicyBuilder<TDestination, TSource> ForModification<TDestination, TSource>()
+        public IApplyToPolicyBuilder<TSource, TDestination> ForModification<TSource, TDestination>()
         {
-            return new ApplyToPolicyBuilder<TDestination, TSource>();
+            return new ApplyToPolicyBuilder<TSource, TDestination>();
         }
     }