Is AFD ever going to make peace with Shinoko? Did she keep, forget about, or actively discard the name Erland gave her (Diana)?

Less of a question, I just noticed you had Jasumi take Erland's name. Also that Shiyoko kept a combined name. Looks like all the 'okos do or intend to do that.

Trying to think of questions that aren't complete self-interest or possible plot spoilers is hard.