[scanner] Fix various hardcoded type name checks