Should it be tevilat keli or tevilat keilim? (this is after the fact, I already opted for keilim since they are two distinct parts).
Interesting question, in fact there is controversy about this, if we consider it two parts of one kli of as two separate keilim, and most poskim say that the bracha is al tevilas kli. It is important to note, that there are those who have the minhag to say keilim even for one kli. Additionally, evn those who say kli for one item, b’dieved even if one switched and said kli instead of keilim or vise versa, the bracha is still valid.
Kesiva V’chasima tova
Kli- Minchas Shlomo 2-66(3), Ashrei Hoish Y:D 9-50, Shevet Hakehosi 6-292, Tevilas Keilim 11 ftnt. 59, Mtzion Teztei Torah 1- pg. 344 in the name of R’ Nebehnzhal shlit”a, Chashukei Chemed Chullin 25b/
Keilim- tevilas Keilim 11 ftnt. 59 in the name of Rivovos Efrayim, chut Shani (Tevilas Keilim) 3.