Updated for 1.0 metadata names.