LILY-249: parts were renamed, so template parsing works as expected however this is a little cleanup