replaced references to owner to user