moved both templates to use underscores

Benjamin Mako Hill || Want to submit a patch?