Move from Jinmei to own codepoint
Adapt ids to name change, change top element