I fail to see how spouses having the same name has any impact on the distribution in the future, the factor that controls that is the names of the children. To fix this you’d need to do something along the lines of girls get the dad’s surname, boys the mother’s, or the other way around. Also Spanish customs are worth looking at.