improve naming of modules / artifacts