Rename to be consistent with nunjucks.
Clean up.