Corrects references to template (instead of descriptor)