Merge "Shorten and remove the word deploy from pod names"