DF-2765 name fixes