Update names of included tempaltes to use underscore