#478: Standardizing metadata nomenclature