For some reason the name collision only showed up after applying !3903 (merged), but it is there so I prepared this to fix it.
