Some internal name fixes