The U.S. Citizenship and Immigration Services has signed a 15-year lease for the former Aloha Airlines office space at Waterfront Plaza.

The USCIS, which is currently at a historical 1930s building designed by Charles W. Dickey across the street at 595 Ala Moana Blvd., was looking for a little more space for its Honolulu field office.

It will be moving into the fourth and fifth floors, measuring about 30,000 square feet, at Building 2 at the plaza. The space will have to be renovated before the final move-in date sometime next year or later.

The Honolulu office serves the entire state of Hawaii and also oversees offices in Guam and the Commonwealth of the Northern Marianas Islands.

The U.S. General Services Administration, meanwhile, is moving in to about 11,000 square feet of office space formerly occupied by the Superferry at Building 1 at the plaza.

The plaza, which is owned by Pacific Office Properties, and is still popularly known as Restaurant Row, has become home to more health care-related tenants in recent months, including CVS/Procare, Covance Clinical Research, a Neospine surgery center and Hawaii P.E.T. Imaging.

Surgical Care Affiliates LLC will be moving into the space currently occupied by Wallace Theaters and opening an outpatient surgery center in the fall of next year. The theater's last movies will be shown on Aug. 2.