Changed a name.
Fix merge.