Quick, update.
I got my citizenship today, I used AC21 when I got my greencard, but none of that was borught up during the interview, the only question remotely related was, do you still work for company x (my current company)? I left the company that I was working with when my gc was approved...