Fix a minor merge issue with a class rename

Auditors: chad, btrahan