Settings management refactoring and checks for name collisions.