Bug 135707 - template reorganisation. This makes the new copies of the templates use all the correct names internally. Patch by me, 2xr=myk.