Bug 6651 - fix splitting of names when updating to 3.4