Fix class metadata naming strategy