@bthirion @schwarty I tried to merge your oral comments. Basically, I made the names as explicit as possible, I tried to use correct english terms, and I looked for coherence between names. Please tell me if this is OK for you.