Change metadata names to match

Some of the metadata names mismatch between heat template and
setup-testenvs, change the ones that don't match.

Change-Id: I121cbe828bddb8cce96b941b50b9a5d2b5d4431c