Retirement tax questions

That's ok.  You still can say you rolled it over (even if back into the same account).