Should I write my full name and ECFMG ID on diploma when I send it to ECFMG?

Hi folks!

1) Should I write my full name and ECFMG ID on the front top page of diploma? Is it okay to write it?

2) Also, I already have a valid 186 on file. In that case, should the credentials I send be specifically addressed to

ECFMG (Attn: Registration & Credentials Services), 3624 Market Street, PA?

or just

ECFMG, 3624 Market Street, PA address is enough?

Thanks! :)