Few minor renamings and refactorings