Rename and adjust for new Twig changes