Make templates constant name internally consistent

Per #396.