Fixed the variable names for metadata. Relates to #1834