rename some extempore template stuff