Renamings and refactoring throughout