Major job name refactoring and moving jobs into a single pipeline as to 2