Fix name of instantiated types