+1 to Ou2mame

That's exactly the way it went down for me most every time.
Also, switching/Upgrading Devices is a great time to get new Batteries and go on and retire the old.
Always a good idea to mate new Devices with new Batteries. Especially if a dual Battery Mod where it is commonly advised and accepted to require new mated Batteries.
Definitely be sure your Batteries have the proper Ratings and proven Test Results to back those Ratings up.
Mooch and Baditude are well known and accepted Battery Senseis here on ECF.
I personally (as well as the majority of Members) take their Direction and Advice Carte Blanche without question.
Another Batt to add to the "Good to Go" list already mentioned is the LG HG2.
I have 2-Sammy 25R's, 4-Sony VTC4's, and now 2-LG HG2's. They replaced older LG HE2's per Mooch's Advice.
Dual 25R's in the Hollowpoint Mech w/0.45 ohm RDA's (HE2's as Emergency backups at work for this Rig)
Run the HG2's in rotation on the SX Mini M with 0.2-0.3 Ti builds for TC
Run the VTC4's in rotation on Kbox & SubBox w/STM's.
Big thing is Do NOT trust Manufacturer Ratings or Seller Claims on Batteries unless Bench-Tested to be true by Mooch.
Also, ONLY buy your Batts from reliable and tried & proven Sources as suggested by Members here. Far too many Fakes and Charletons in the Battery Bidnez...
RTD Vapor is an awesome Battery Source that carries Authentics and all the Selection of Proven Batteries you will ever need. Couple other well known Sources as well but RTDV is the only one I have 1st hand experience with.
Beware buying Batteries on eBay.... Actually, don't beware; Just don't do it and spare yourself the inevitable pain and aggravation.
Another well bandied about Altruism here on ECF,,,
If it has "Fire" in the Brand Name=Just Say NO.