diff --git a/java/build/org/apache/derbyBuild/GeneratorBase.java b/java/build/org/apache/derbyBuild/GeneratorBase.java
index 47b74b2d4e..73243689b1 100644
--- a/java/build/org/apache/derbyBuild/GeneratorBase.java
+++ b/java/build/org/apache/derbyBuild/GeneratorBase.java
@@ -786,7 +786,7 @@ public static void replaceTag(Document doc, String tag,
     /**
      * Format an error for later reporting.
      * @param text description
-     * @param t execption that occured
+     * @param t exception that occurred
      * @return formatted error with stack trace
      */
     public static String formatError(String text, Throwable t) {
diff --git a/java/org.apache.derby.engine/org/apache/derby/iapi/store/access/FileResource.java b/java/org.apache.derby.engine/org/apache/derby/iapi/store/access/FileResource.java
index 5634449c0e..bfa72a9a5e 100644
--- a/java/org.apache.derby.engine/org/apache/derby/iapi/store/access/FileResource.java
+++ b/java/org.apache.derby.engine/org/apache/derby/iapi/store/access/FileResource.java
@@ -71,7 +71,7 @@ public interface FileResource {
 	  @return the generationId for the file resource. This
 	  quantity increases when you replace the file resource.
 
-	  @exception StandardException some error occured.
+	  @exception StandardException some error occurred.
 	*/
 	public long add(String name,InputStream source)
 		throws StandardException;
@@ -82,7 +82,7 @@ public long add(String name,InputStream source)
 
 	  @param name the name of the fileResource to remove.
 	  
-	  @exception StandardException some error occured.
+	  @exception StandardException some error occurred.
 	  */
 	public void remove(String name, long currentGenerationId)
 		throws StandardException;
@@ -105,7 +105,7 @@ public void remove(String name, long currentGenerationId)
 	  the file resource.
 	  @return the generationId for the new 'current' version of the
 	          file resource. 
-	  @exception StandardException some error occured.
+	  @exception StandardException some error occurred.
 	*/
 	public long replace(String name, long currentGenerationId, InputStream source)
 		throws StandardException;
diff --git a/java/org.apache.derby.engine/org/apache/derby/impl/services/locks/Lock.java b/java/org.apache.derby.engine/org/apache/derby/impl/services/locks/Lock.java
index 7def6ea328..c6a977dde7 100644
--- a/java/org.apache.derby.engine/org/apache/derby/impl/services/locks/Lock.java
+++ b/java/org.apache.derby.engine/org/apache/derby/impl/services/locks/Lock.java
@@ -126,7 +126,7 @@ int unlock(int unlockCount) {
 		count -= unlockCount;
 		if (count == 0) {
 
-			// Inform the object an unlock event occured with this qualifier
+			// Inform the object an unlock event occurred with this qualifier
 
 			ref.unlockEvent(this);
 		}