DF#2136,2129,2182 Changed some typos and names