CORE-1356 Original fix was still failing because type name was coming ba...

...ck in lowercase and code was looking for uppercase.  Made string comparison case-insensitive.