Rationalized template naming; misc. tweaks