Revert "Changing deployment and service names to be the same"
Revert "Changing deployment and service names to be the same"

This reverts commit ece8fc105191df79217114a3e139b12bb29b233c.

zubairq/yazz,zubairq/gosharedata,zubairq/gosharedata,zubairq/yazz