merge changes from iotools (fix names; duplicate if needed)