Change public_id to publicId