That's spot on. Just park International Short Term, and walk right in. Just make sure you have an appointment. It gets booked pretty far out.

My wife went there to register her new passport (name change, no appt needed), and just doing that took about 30 minutes.