Rename tag and container names in helper scripts