Responsibility consolidation. Renaming.