diff --git a/src/main/java/org/apache/commons/fileupload/util/Streams.java b/src/main/java/org/apache/commons/fileupload/util/Streams.java
index 5951fb5..8f8e022 100644
--- a/src/main/java/org/apache/commons/fileupload/util/Streams.java
+++ b/src/main/java/org/apache/commons/fileupload/util/Streams.java
@@ -51,7 +51,7 @@
      *   copy(pInputStream, pOutputStream, new byte[8192]);
      * </pre>
      *
-     * @param pInputStream The input stream, which is being read.
+     * @param inputStream The input stream, which is being read.
      * It is guaranteed, that {@link InputStream#close()} is called
      * on the stream.
      * @param outputStream The output stream, to which data should
@@ -64,10 +64,10 @@
      * @return Number of bytes, which have been copied.
      * @throws IOException An I/O error occurred.
      */
-    public static long copy(InputStream pInputStream,
+    public static long copy(InputStream inputStream,
             OutputStream outputStream, boolean closeOutputStream)
             throws IOException {
-        return copy(pInputStream, outputStream, closeOutputStream,
+        return copy(inputStream, outputStream, closeOutputStream,
                 new byte[DEFAULT_BUFFER_SIZE]);
     }
 
