#5: Made naming consistent across artifact, Gir project & build job.