Further refactorings and renamings