update template names
move toward filtering names