changed to the PA1_template name
more fixing of names