Revert "Fix metadata field names"

This reverts commit 4f76a75f4148947bdc9e89c5fe5ee47c79b17f8e.