DF#2077,2046 typos and name changes