name updates / code optimize