improve naming of more modules / artifacts