#5 Templates renamed properly.