Houskeeping, improved class name wording