Refactorings and name changes