Made artifact names more consistent