Renamings and more refactoring