More important is that Li-ion cells are no joke, and are not equivalent to ‘AA’ or ‘AAA’ battery formats. You can NCM, NCA, LFP, Cobalt chemistries and blends within - not even accounting for differing mAH and charge/discharge capacities. 18650 is simply a form factor.
Better labeling, specing, regulated and certified repair processes are just a start for solutions as it is currently a Wild West.
However, statements like ‘Li-ion should be replaced ASAP’ do not factor in that… lithium ion as a platform is not going anywhere and has essentially won at least the next half century for 18650 type form factors and applications. Moving away is not a reasonable solution.