Refactorings, renamings, sensible defaults