Shortened templates names

And changed to keep a copy of original template