GPS: Fix parameter names that were too long