Templates converted to new naming conventions (thanks to Chak Tan)
17 files changed