Fix renaming bug