Handle change name and fixed name conflict bug.