Will Pokebank hold a solution to the caps/no caps Pokemon name issue between gen III and the later ones?

I have a shiny Lombre on Emerald and want to know if I should wait to evolve it til I get her into a lower-case game. I don't want an out of place LUDICOLO.