change internal template naming, perhaps this fixes the include problems