packaging cleanup / changed artifacts ids for better consistency