some renamings to make things clearer