containsDerivedPart to containsPart
rename generator class and template matching functions