fix double-naming bug