Question regarding proof of education for permanent residency

Apologies if this has been answered before, I was surprised I couldn't find much since this must be a fairly common part of applying for PR via HSP.

I'm preparing my application for PR via the HSP 80+ points route. In particular I have been filling in the points calculation sheet and preparing the necessary evidence as listed in the 疎明資料(基本例)section. The evidence for proving my academic background (学歴) is listed as: 該当する学歴の卒業証明書及び学位取得の証明書

I did a bunch of research and couldn't find any information on the difference between a 卒業証明書 and a 学位取得の証明書. I went to a US university for my degree, and they gave me a diploma, and I should have copies of my transcript, but nothing else. So my questions are:

  1. Is my interpretation correct that both of these documents are required?
  2. If so, what exactly are they expecting?
  3. For people who got PR via HSP, what did you actually submit as proof of education?

I did see this thread from a while ago which seems to suggest that a diploma alone should suffice, but I would be interested in hearing more recent accounts if possible.

by WhippuChan