Merge "Changed strings for DND"