Use the correct fields, following discussions over artefact vs module