Updated mappings for UKAEA