Use class value instead of QName #1535