Bring templatetags inline with earlier renames
commits:
a8a140fa94baa13f778f9a1529de8d5c2b75e3f2
6341b576bf9fa18c4dc1c78aaa88e174826763f6