PTFM-6107 Rename Alignment category to Mapping (and other renames)