Fix two missed renames