Fix accidental renames that happened during merge