Make naming of metadata related attributes more consistent.