fixing auto naming issue