Added uniquify buffer-nmaes.