Fixes merge related naming issue.