Refactor adoptee naming to match adopter