CON-105 | Forms - templates renamed (ups)