rename env vars
redo heat templates