altered chunk names, fix template references