Make the naming of metadata related attributes consistent.