Fixed #3157 Prevent billing & shipping names from overwrites; props @clifgriffin