Update support type code to use simple names.