Twig updates for coding convention