Tesla is currently making two module types, the modules for the 75/90 packs and the 100 pack modules. I expect the 75 will go to an 85 and the 90 will be dropped sometime this year as they standardize on the larger capacity module used in the 100 pack.
After that the next battery upgrade will probably be when they switch to GF produced 2170s for the X and S, but that will probably be a year or more. I think Elon has said that the S and X will continue to use 18650s for the foreseeable future as all GF production is going to go into Model 3 and stationary systems production until supply exceeds demand. When the GF is at peak production cells for the S and X will likely be a tiny percentage of their overall production.