fix some mistakes in fresh names handling