Fixed name updates