The notes are correct but I think that that there are a couple of spellings that should change.
Fdim would be F Ab Cb
A#dim would be A# C# E
Yeah, this is that enharmonic thing again.
I'm not sure if there is an absolute crisp solution that fully answers this.
This image is from pianochord.org but I'm not sure that even this is the "truth" . . .