Renamed to MetadataKey & minor fixes.