Fix inconsistent key name. This change is backwards compatible.

Later, remove these keys in favor of blocks.

Closes #338.