Updated artefact names and dependency names to be clearer and more consistent.