Fixed renaming bug