Season 1 FBI or CIA

ok so i have another question,
in this episode we find out that helaki was FBI
because he was seen having lunch at the rotunda,
which apparently only FBI are allowed into.

then we have series 2 where its set in the rotunda,
however we're still the CIA,
was it just a slip up???
Haladki was just an interagency liason, same as Lauren who was working for the NSA at the CIA (if you ignore the Covenant)