Can you post up the fix? I am having the same problem. Samples in checkout have same naming convention as the main product.
I am communicating with M&S about this feature. Will post an update
Hey dtynan,
Thanks for the reply. I was thinking along the same line as you. I have sent an email to M&S about them taking on this project and have not heard back yet.
I will keep on trying a few attempts otherwise I can just word the email template copy to be generic.