Gyms with different country fighters

I was playing ringside and noticed that I had japanese fighters and other fighters from multiple other countries I had gyms in, in my gym in Cuba.

Is there a way to fix the fighters being in the wrong gyms? Or a way to choose what gym your fighter goes to?