diff --git a/src/pkg/math/atan2.go b/src/pkg/math/atan2.go
index 7165c539ee..26d3a1d682 100644
--- a/src/pkg/math/atan2.go
+++ b/src/pkg/math/atan2.go
@@ -4,20 +4,19 @@
 
 package math
 
-
-// Atan returns the arc tangent of y/x, using
+// Atan2 returns the arc tangent of y/x, using
 // the signs of the two to determine the quadrant
 // of the return value.
-func Atan2(x, y float64) float64 {
+func Atan2(y, x float64) float64 {
 	// Determine the quadrant and call atan.
-	if x+y == x {
-		if x >= 0 {
+	if y+x == y {
+		if y >= 0 {
 			return Pi / 2
 		}
 		return -Pi / 2;
 	}
-	q := Atan(x / y);
-	if y < 0 {
+	q := Atan(y / x);
+	if x < 0 {
 		if q <= 0 {
 			return q + Pi
 		}