Fixed errors in name changing.