fixed some corner-case name crashes