Fix strange renaming bug