I and my husband are having the same kind of issue with our Samsung Galaxy S6s. Can I ask what you had to do to fix it?
His phone only does this when he sends photos or MMS and it shows that they are coming from my telephone number and if someone responds it comes to my phone, not to his... So...