Merge "Fix settings name"