DD's 25lb, wearing Pampers Baby Dry #5 and we would be increasing to #6 soon. At night she's on Huggies night time diapers #5. And it still leaks at times.

I want to get training pants or Pull Ups. I'm assuming they're the same thing?

In terms of brands is one better than the other?
What should I replace the night time diapers with?
Lastly, what size... 2T?

Thank you.