MODE-295 More fixes to the build and made artifact names more consistent/appropriate