few renamings and a bit of refactoring