Changing names breaking templates - Got talking to Quinlan and have run
out of time tonight