Cleaned up Template rename, and fixed some regressions.