Change name. Refs #10699
Try to solve merge conflict. Refs #10699
Merge remote-tracking branch 'origin/feature/10699_renameMDNormSXD'