Merge name change patch from upstream repository