I've heard Type-96G or Gai. Actually, refits and improvements are constantly going on, and seldom reported, since there are no press releases of contracts or whatever. For example, I've heard the Type-99s have been through a few refits already. I've also heard the 96s are steadily being upgraded to 99's FCS standards (which the larger optics may suggest). Of course, these are all rumors.
There were rumors floating around of the 96 with new applique quite a long time before the pictures finally came out. However, there are still lots of photos of type 96s with the original look.
As to 99 vs 96, it is a high-low combination. The type 96 may slowly eventually replace the older models (maybe not 1 for 1), but the type 99 certainly will not be produced in such high numbers, owing to cost.