diff --git a/src/main/java/pythagoras/f/Ellipse.java b/src/main/java/pythagoras/f/Ellipse.java
index 0db5ffa..2b0f108 100644
--- a/src/main/java/pythagoras/f/Ellipse.java
+++ b/src/main/java/pythagoras/f/Ellipse.java
@@ -57,7 +57,7 @@ public class Ellipse extends AbstractEllipse implements Serializable
     }
 
     @Override // from RectangularShape
-    public void setFrame (float x, float y, float w, float h) {
+    public void setFrame (float x, float y, float width, float height) {
         this.x = x;
         this.y = y;
         this.width = width;
diff --git a/src/main/java/pythagoras/f/IShape.java b/src/main/java/pythagoras/f/IShape.java
index 0e9b3a3..108cabe 100644
--- a/src/main/java/pythagoras/f/IShape.java
+++ b/src/main/java/pythagoras/f/IShape.java
@@ -19,13 +19,13 @@ public interface IShape
     boolean contains (IPoint point);
 
     /** Returns true if this shape completely contains the specified rectangle. */
-    boolean contains (float x, float y, float w, float h);
+    boolean contains (float x, float y, float width, float height);
 
     /** Returns true if this shape completely contains the supplied rectangle. */
     boolean contains (IRectangle r);
 
     /** Returns true if this shape intersects the specified rectangle. */
-    boolean intersects (float x, float y, float w, float h);
+    boolean intersects (float x, float y, float width, float height);
 
     /** Returns true if this shape intersects the supplied rectangle. */
     boolean intersects (IRectangle r);
diff --git a/src/main/java/pythagoras/f/Rectangle.java b/src/main/java/pythagoras/f/Rectangle.java
index 79bc69a..8e1ca57 100644
--- a/src/main/java/pythagoras/f/Rectangle.java
+++ b/src/main/java/pythagoras/f/Rectangle.java
@@ -27,9 +27,7 @@ public class Rectangle extends AbstractRectangle implements Serializable
      * Constructs a rectangle at (0,0) and with dimensions (0,0).
      */
     public Rectangle () {
-    }
-
-    /**
+    }     /**
      * Constructs a rectangle with the supplied upper-left corner and dimensions (0,0).
      */
     public Rectangle (IPoint p) {
@@ -182,7 +180,7 @@ public class Rectangle extends AbstractRectangle implements Serializable
     }
 
     @Override // from RectangularShape
-    public void setFrame (float x, float y, float w, float h) {
-        setBounds(x, y, w, h);
+    public void setFrame (float x, float y, float width, float height) {
+        setBounds(x, y, width, height);
     }
 }
diff --git a/src/main/java/pythagoras/f/RectangularShape.java b/src/main/java/pythagoras/f/RectangularShape.java
index af7f60a..1d0e608 100644
--- a/src/main/java/pythagoras/f/RectangularShape.java
+++ b/src/main/java/pythagoras/f/RectangularShape.java
@@ -13,7 +13,7 @@ public abstract class RectangularShape implements IRectangularShape
     /**
      * Sets the location and size of the framing rectangle of this shape to the specified values.
      */
-    public abstract void setFrame (float x, float y, float w, float h);
+    public abstract void setFrame (float x, float y, float width, float height);
 
     /**
      * Sets the location and size of the framing rectangle of this shape to the supplied values.