fix bugs with names