VALG 40 - Rename templates to be used only in current display.
Merge branch 'VALG-40' into develop