326 - Fixing metadata naming