Revert "Rename name of pod spec as well"

This reverts commit b8f1df6940fab321ac82c5c6db66a5b4191f6c41.