documentation and some further renamings