[#BOXAPP-12: Fixing template name embedded]