TEIID-3097 broadening the check to include internal model names as well