Hi Vitaly, your renaming suggestions make sense, I will send follow-on patches to do that. Regards, Joerg