Actually use new `fif` function in templates
Rename wrappers