Tune up variable and yaml key names

It's tending towards too verbose now, but is a little more
meaningful.