*8315* fix variable names, remove extra template assignment