refactoring: use longer parameter names
fix #4458: no arrow without play services on the map