Rename and removing name clash