Before revision: GNSS has now replaced both.
After revision: GPS has now replaced both.