Renamed template tags to match updates.