rename generator class and template matching functions