diff --git a/src/main/java/com/avaje/ebeaninternal/server/deploy/parse/AnnotationAssocManys.java b/src/main/java/com/avaje/ebeaninternal/server/deploy/parse/AnnotationAssocManys.java
index 1e6ebb809..f2d0c50c0 100644
--- a/src/main/java/com/avaje/ebeaninternal/server/deploy/parse/AnnotationAssocManys.java
+++ b/src/main/java/com/avaje/ebeaninternal/server/deploy/parse/AnnotationAssocManys.java
@@ -231,7 +231,7 @@ public class AnnotationAssocManys extends AnnotationParser {
 			for (int i = 0; i < localIds.length; i++) {
 				// add the source to intersection join columns
 				String fkCol = localTableName+"_"+localIds[i].getDbColumn();
-				intJoin.addJoinColumn(new DeployTableJoinColumn(localIds[i].getDbColumn(), fkCol));
+                intJoin.addJoinColumn(new DeployTableJoinColumn(localIds[i].getDbColumn(), namingConvention.getColumnFromProperty(null, fkCol)));
 			}
     	}
 
@@ -241,7 +241,7 @@ public class AnnotationAssocManys extends AnnotationParser {
 			for (int i = 0; i < otherIds.length; i++) {
 				// set the intersection to dest table join columns
 				final String fkCol = otherTableName+"_"+otherIds[i].getDbColumn();
-				destJoin.addJoinColumn(new DeployTableJoinColumn(fkCol, otherIds[i].getDbColumn()));
+                destJoin.addJoinColumn(new DeployTableJoinColumn(namingConvention.getColumnFromProperty(null, fkCol), otherIds[i].getDbColumn()));				
 			}
 		}