some renamings and doc