Normalize Fortran code with develop (#1600)

42 files changed, 201 insertions, 178 deletions

diff --git a/fortran/examples/compound.f90 b/fortran/examples/compound.f90
index d9f8235..57624c6 100644
--- a/fortran/examples/compound.f90
+++ b/fortran/examples/compound.f90
@@ -41,7 +41,7 @@
      INTEGER(HID_T) :: dt3_id      ! Memory datatype identifier (for double precision field)
      INTEGER(HID_T) :: dt4_id      ! Memory datatype identifier (for real field)
      INTEGER(HID_T) :: dt5_id      ! Memory datatype identifier
-     INTEGER(HID_T) :: plist_id    ! Dataset trasfer property
+     INTEGER(HID_T) :: plist_id    ! Dataset transfer property
      INTEGER(SIZE_T) :: typesize
 
 
@@ -111,21 +111,21 @@
      type_size = type_sizec + type_sizei + type_sized + type_sizer
      CALL h5tcreate_f(H5T_COMPOUND_F, type_size, dtype_id, error)
      !
-     ! Insert memebers
+     ! Insert members
      !
-     ! CHARACTER*2 memeber
+     ! CHARACTER*2 member
      !
      offset = 0
      CALL h5tinsert_f(dtype_id, "char_field", offset, dt5_id, error)
      !
      ! INTEGER member
      !
-     offset = offset + type_sizec ! Offset of the second memeber is 2
+     offset = offset + type_sizec ! Offset of the second member is 2
      CALL h5tinsert_f(dtype_id, "integer_field", offset, H5T_NATIVE_INTEGER, error)
      !
      ! DOUBLE PRECISION member
      !
-     offset = offset + type_sizei  ! Offset of the third memeber is 6
+     offset = offset + type_sizei  ! Offset of the third member is 6
      CALL h5tinsert_f(dtype_id, "double_field", offset, H5T_NATIVE_DOUBLE, error)
      !
      ! REAL member
@@ -198,7 +198,7 @@
      !
      CALL h5dopen_f(file_id, dsetname, dset_id, error)
      !
-     ! Create memeory datatyoe to read character member of the compound datatype.
+     ! Create memory datatype to read character member of the compound datatype.
      !
      CALL h5tcopy_f(H5T_NATIVE_CHARACTER, dt2_id, error)
      typesize = 2
@@ -208,7 +208,7 @@
      offset = 0
      CALL h5tinsert_f(dt1_id, "char_field", offset, dt2_id, error)
      !
-     ! Read part of the datatset and display it.
+     ! Read part of the dataset and display it.
      !
      CALL h5dread_f(dset_id, dt1_id, char_member_out, data_dims, error)
      write(*,*) (char_member_out(i), i=1, dimsize)
diff --git a/fortran/examples/h5_cmprss.f90 b/fortran/examples/h5_cmprss.f90
index 61efc30..86d9cfa 100644
--- a/fortran/examples/h5_cmprss.f90
+++ b/fortran/examples/h5_cmprss.f90
@@ -51,7 +51,7 @@ PROGRAM h5_cmprss
   !INTEGER :: szip_pixels_per_block
 
   !
-  !Initialize FORTRAN predifined datatypes
+  !Initialize FORTRAN predefined datatypes
   !
   CALL h5open_f(error)
   !
diff --git a/fortran/examples/h5_crtatt.f90 b/fortran/examples/h5_crtatt.f90
index 996a506..64d2bde 100644
--- a/fortran/examples/h5_crtatt.f90
+++ b/fortran/examples/h5_crtatt.f90
@@ -35,7 +35,7 @@ PROGRAM H5_CRTATT
   INTEGER(HID_T) :: aspace_id     ! Attribute Dataspace identifier
   INTEGER(HID_T) :: atype_id      ! Attribute Dataspace identifier
   INTEGER(HSIZE_T), DIMENSION(1) :: adims = (/2/) ! Attribute dimension
-  INTEGER     ::   arank = 1                      ! Attribure rank
+  INTEGER     ::   arank = 1                      ! Attribute rank
   INTEGER(SIZE_T) :: attrlen    ! Length of the attribute string
 
   CHARACTER(LEN=80), DIMENSION(2) ::  attr_data  ! Attribute data
diff --git a/fortran/examples/h5_extend.f90 b/fortran/examples/h5_extend.f90
index 0ad6ef9..193f33e 100644
--- a/fortran/examples/h5_extend.f90
+++ b/fortran/examples/h5_extend.f90
@@ -86,7 +86,7 @@ PROGRAM H5_EXTEND
   INTEGER, DIMENSION(1:3,1:10)  :: rdata
 
   !
-  !Initialize FORTRAN predifined datatypes
+  !Initialize FORTRAN predefined datatypes
   !
   CALL h5open_f(error)
 
@@ -110,7 +110,7 @@ PROGRAM H5_EXTEND
   CALL h5pset_chunk_f(crp_list, RANK, dimsc, error)
 
   !
-  !Create a dataset with 3X3 dimensions using cparms creation propertie .
+  !Create a dataset with 3X3 dimensions using cparms creation properties .
   !
   CALL h5dcreate_f(file_id, dsetname, H5T_NATIVE_INTEGER, dataspace, &
        dset_id, error, crp_list )
diff --git a/fortran/examples/refobjexample.f90 b/fortran/examples/refobjexample.f90
index d420192..873b420 100644
--- a/fortran/examples/refobjexample.f90
+++ b/fortran/examples/refobjexample.f90
@@ -26,7 +26,7 @@
      IMPLICIT NONE
      CHARACTER(LEN=10), PARAMETER :: filename = "FORTRAN.h5"  ! File
      CHARACTER(LEN=8), PARAMETER :: dsetnamei = "INTEGERS"    ! Dataset with the integer data
-     CHARACTER(LEN=17), PARAMETER :: dsetnamer = "OBJECT_REFERENCES" ! Dataset wtih object
+     CHARACTER(LEN=17), PARAMETER :: dsetnamer = "OBJECT_REFERENCES" ! Dataset with object
                                                                      ! references
      CHARACTER(LEN=6), PARAMETER :: groupname1 = "GROUP1"            ! Groups in the file
      CHARACTER(LEN=6), PARAMETER :: groupname2 = "GROUP2"            !
diff --git a/fortran/examples/testh5fc.sh.in b/fortran/examples/testh5fc.sh.in
index db687d8..71f41f8 100644
--- a/fortran/examples/testh5fc.sh.in
+++ b/fortran/examples/testh5fc.sh.in
@@ -61,7 +61,7 @@ applib=libapp${H5TOOL}.a
 # short hands
 # Caution: if some *.h5 files must be cleaned here, list them by names.
 # Don't use the wildcard form of *.h5 as it will wipe out even *.h5 generated
-# by otehr test programs. This will cause a racing condition error when
+# by other test programs. This will cause a racing condition error when
 # parallel make (e.g., gmake -j 4) is used.
 temp_SRC="$hdf5main $appmain $prog1 $prog2"
 temp_OBJ=`echo $temp_SRC | sed -e "s/\.${suffix}/.o/g"`
diff --git a/fortran/src/H5Af.c b/fortran/src/H5Af.c
index f78ade2..db1c040 100644
--- a/fortran/src/H5Af.c
+++ b/fortran/src/H5Af.c
@@ -272,7 +272,7 @@ done:
  * PURPOSE
  *  Call H5Aopen to open an attribute
  * INPUTS
- *  obj_id       - Identifer for object to which attribute is attached
+ *  obj_id       - Identifier for object to which attribute is attached
  *	        attr_name    - Attribute access property list
  *  attr_namelen - size of attr_name
  *  aapl_id      - Link access property list
@@ -317,7 +317,7 @@ done:
  * PURPOSE
  *  Call h5adelete_by_name to remove an attribute from a specified location
  * INPUTS
- *  loc_id - identifer for object to which attribute is attached
+ *  loc_id - identifier for object to which attribute is attached
  *  obj_name - object identifier
  *  obj_namelen - name length
  *  attr_name - name of the attribute
@@ -424,7 +424,7 @@ done:
  * INPUTS
  *
  *
- *  loc_id - Identifer for object to which attribute is attached
+ *  loc_id - Identifier for object to which attribute is attached
  *  obj_name - Name of object, relative to location,
  *  from which attribute is to be removed *TEST* check NULL
  *  idx_type - Type of index; Possible values are:
@@ -532,7 +532,7 @@ done:
  *  aapl_id - Attribute access property list
  *  lapl_id - Link access property list
  * OUTPUTS
- *  attr_id - attribute identifer
+ *  attr_id - attribute identifier
  * RETURNS
  *  0 on success, -1 on failure
  * AUTHOR
diff --git a/fortran/src/H5Aff.F90 b/fortran/src/H5Aff.F90
index 8f56993..53f0a39 100644
--- a/fortran/src/H5Aff.F90
+++ b/fortran/src/H5Aff.F90
@@ -211,7 +211,7 @@ CONTAINS
 !
 ! INPUTS
 !  obj_id 	 - identifier of a group, dataset, or named
-!                  datatype atttribute to be attached to
+!                  datatype attribute to be attached to
 !  name 	 - attribute name
 ! OUTPUTS
 !  attr_id 	 - attribute identifier
@@ -487,7 +487,7 @@ CONTAINS
   SUBROUTINE h5aget_name_by_idx_f(loc_id, obj_name, idx_type, order, &
        n, name, hdferr, size, lapl_id)
     IMPLICIT NONE
-    INTEGER(HID_T), INTENT(IN) :: loc_id      ! Identifer for object to which attribute is attached
+    INTEGER(HID_T), INTENT(IN) :: loc_id      ! Identifier for object to which attribute is attached
     CHARACTER(LEN=*), INTENT(IN) :: obj_name  ! Name of object, relative to location,
                                               !  from which attribute is to be removed *TEST* check NULL
     INTEGER, INTENT(IN) :: idx_type ! Type of index; Possible values are:
@@ -846,7 +846,7 @@ CONTAINS
 !  identifier and attribute name
 !
 ! INPUTS
-!  obj_id 	 - Identifer for object to which attribute is attached
+!  obj_id 	 - Identifier for object to which attribute is attached
 !  attr_name 	 - Name of attribute to open
 ! OUTPUTS
 !  attr_id 	 - attribute identifier
@@ -934,7 +934,7 @@ CONTAINS
 ! SOURCE
   SUBROUTINE H5Adelete_by_idx_f(loc_id, obj_name, idx_type, order, n, hdferr, lapl_id)
     IMPLICIT NONE
-    INTEGER(HID_T), INTENT(IN) :: loc_id      ! Identifer for object to which attribute is attached
+    INTEGER(HID_T), INTENT(IN) :: loc_id      ! Identifier for object to which attribute is attached
     CHARACTER(LEN=*), INTENT(IN) :: obj_name  ! Name of object, relative to location,
                                               !  from which attribute is to be removed
     INTEGER, INTENT(IN) :: idx_type           ! Type of index; Possible values are:
@@ -991,7 +991,7 @@ CONTAINS
 !  Removes an attribute from a specified location
 !
 ! INPUTS
-!  loc_id 	 - Identifer for object to which attribute is attached
+!  loc_id 	 - Identifier for object to which attribute is attached
 !  obj_name 	 - Name of attribute to open
 !  attr_name 	 - Attribute access property list
 !  lapl_id 	 - Link access property list
@@ -1005,7 +1005,7 @@ CONTAINS
 ! SOURCE
   SUBROUTINE H5Adelete_by_name_f(loc_id, obj_name, attr_name, hdferr, lapl_id)
     IMPLICIT NONE
-    INTEGER(HID_T), INTENT(IN) :: loc_id      ! Identifer for object to which attribute is attached
+    INTEGER(HID_T), INTENT(IN) :: loc_id      ! Identifier for object to which attribute is attached
     CHARACTER(LEN=*), INTENT(IN) :: obj_name  ! Name of object, relative to location,
                                               !  from which attribute is to be removed
     CHARACTER(LEN=*), INTENT(IN) :: attr_name ! Name of attribute to delete
@@ -1841,7 +1841,7 @@ CONTAINS
 !  dims parameter was added to make code portable;
 !  Aprile 4, 2001
 !
-!  Changed buf intent to INOUT to be consistant
+!  Changed buf intent to INOUT to be consistent
 !  with how the C functions handles it. The pg
 !  compiler will return 0 if a buf value is not set.
 !  February, 2008
diff --git a/fortran/src/H5Df.c b/fortran/src/H5Df.c
index bcf792c..a780683 100644
--- a/fortran/src/H5Df.c
+++ b/fortran/src/H5Df.c
@@ -145,7 +145,7 @@ DONE:
  *  Elena Pourmal
  *  Tuesday, May 14, 2002
  * HISTORY
- *  This function was added to accomodate h5dwrite_f with the
+ *  This function was added to accommodate h5dwrite_f with the
  *  dims argument being of INTEGER(HSIZE_T) type
  * SOURCE
  */
@@ -217,7 +217,7 @@ h5dwrite_ref_reg_c(hid_t_f *dset_id, hid_t_f *mem_type_id, hid_t_f *mem_space_id
  *  Elena Pourmal
  *  Wednesday, May 15, 2002
  * HISTORY
- *  This function was added to accomodate h5dread_f subroutine
+ *  This function was added to accommodate h5dread_f subroutine
  *  with the dims parameter being of INTEGER(HSIZE_T_F) size.
  * SOURCE
  */
@@ -495,10 +495,10 @@ h5dget_storage_size_c(hid_t_f *dset_id, hsize_t_f *size)
 
     c_dset_id = (hid_t)*dset_id;
     c_size    = H5Dget_storage_size(c_dset_id);
-    if (c_size == 0)
-        return ret_value;
-    *size     = (hsize_t_f)c_size;
-    ret_value = 0;
+    if (c_size != 0) {
+        ret_value = 0;
+    }
+    *size = (hsize_t_f)c_size;
     return ret_value;
 }
 
@@ -783,7 +783,7 @@ h5dwrite_vl_string_c(hid_t_f *dset_id, hid_t_f *mem_type_id, hid_t_f *mem_space_
         return ret_value;
     }
     /*
-     * Move data from temorary buffer
+     * Move data from temporary buffer
      */
     tmp_p = tmp;
     for (i = 0; i < num_elem; i++) {
diff --git a/fortran/src/H5Dff.F90 b/fortran/src/H5Dff.F90
index 75af58e..6b77a8c 100644
--- a/fortran/src/H5Dff.F90
+++ b/fortran/src/H5Dff.F90
@@ -476,7 +476,7 @@ CONTAINS
 !
 !  Changed name from the now obsolete h5dextend_f
 !  to h5dset_extent_f. Provided interface to old name
-!  for backward compatability. -MSB- March 14, 2008
+!  for backward compatibility. -MSB- March 14, 2008
 !
 ! SOURCE
   SUBROUTINE h5dset_extent_f(dataset_id, size, hdferr)
@@ -1195,7 +1195,7 @@ CONTAINS
     IMPLICIT NONE
     INTEGER(HID_T), INTENT(IN) :: dset_id     ! Dataset identifier
     INTEGER(HID_T), INTENT(IN) :: mem_type_id ! Memory datatype identifier
-    INTEGER(HSIZE_T), DIMENSION(*), INTENT(IN) :: dims ! size of the bufffer buf
+    INTEGER(HSIZE_T), DIMENSION(*), INTENT(IN) :: dims ! size of the buffer buf
     TYPE(hobj_ref_t_f), DIMENSION(dims(1)), INTENT(IN), TARGET :: buf ! Data buffer
     INTEGER, INTENT(OUT) :: hdferr      ! Error code
     INTEGER(HID_T), OPTIONAL, INTENT(IN) :: mem_space_id  ! Memory dataspace identfier
@@ -1227,7 +1227,7 @@ CONTAINS
     IMPLICIT NONE
     INTEGER(HID_T), INTENT(IN) :: dset_id     ! Dataset identifier
     INTEGER(HID_T), INTENT(IN) :: mem_type_id ! Memory datatype identifier
-    INTEGER(HSIZE_T), DIMENSION(*), INTENT(IN) :: dims ! size of the bufffer buf
+    INTEGER(HSIZE_T), DIMENSION(*), INTENT(IN) :: dims ! size of the buffer buf
     TYPE(hdset_reg_ref_t_f), DIMENSION(dims(1)), INTENT(IN), TARGET :: buf ! Data buffer
     INTEGER, INTENT(OUT) :: hdferr      ! Error code
     INTEGER(HID_T), OPTIONAL, INTENT(IN) :: mem_space_id  ! Memory dataspace identfier
@@ -1625,8 +1625,7 @@ CONTAINS
 ! Inputs:
 !		fill_value	- fill value
 !		space_id	- memory space selection identifier
-!		buf		- data buffer iin memory ro apply selection to
-!				- of k-th dimension of the buf array
+!		buf		- memory buffer containing the selection to be filled
 ! Outputs:
 !		hdferr:		- error code
 !				 	Success:  0
@@ -1676,8 +1675,7 @@ CONTAINS
 ! Inputs:
 !		fill_value	- fill value
 !		space_id	- memory space selection identifier
-!		buf		- data buffer iin memory ro apply selection to
-!				- of k-th dimension of the buf array
+!		buf		- memory buffer containing the selection to be filled
 ! Outputs:
 !		hdferr:		- error code
 !				 	Success:  0
@@ -1724,8 +1722,7 @@ CONTAINS
   ! Inputs:
   !		fill_value	- fill value
   !		space_id	- memory space selection identifier
-  !		buf		- data buffer iin memory ro apply selection to
-  !				- of k-th dimension of the buf array
+  !		buf		- memory buffer containing the selection to be filled
   ! Outputs:
   !		hdferr:		- error code
   !				 	Success:  0
@@ -1799,8 +1796,7 @@ CONTAINS
 ! Inputs:
 !		fill_value	- fill value
 !		space_id	- memory space selection identifier
-!		buf		- data buffer iin memory ro apply selection to
-!				- of k-th dimension of the buf array
+!		buf		- memory buffer containing the selection to be filled
 ! Outputs:
 !		hdferr:		- error code
 !				 	Success:  0
diff --git a/fortran/src/H5Ff.c b/fortran/src/H5Ff.c
index f943200..339f8b7 100644
--- a/fortran/src/H5Ff.c
+++ b/fortran/src/H5Ff.c
@@ -583,7 +583,7 @@ h5fget_name_c(hid_t_f *obj_id, size_t_f *size, _fcd buf, size_t_f *buflen)
     int_f   ret_value = 0; /* Return value */
 
     /*
-     * Allocate buffer to hold name of an attribute
+     * Allocate buffer to hold name of file
      */
     if (NULL == (c_buf = (char *)HDmalloc((size_t)*buflen + 1)))
         HGOTO_DONE(FAIL);
@@ -591,7 +591,7 @@ h5fget_name_c(hid_t_f *obj_id, size_t_f *size, _fcd buf, size_t_f *buflen)
     /*
      * Call H5Fget_name function
      */
-    if ((size_c = H5Fget_name((hid_t)*obj_id, c_buf, (size_t)*buflen)) < 0)
+    if ((size_c = H5Fget_name((hid_t)*obj_id, c_buf, (size_t)*buflen + 1)) < 0)
         HGOTO_DONE(FAIL);
 
     /*
diff --git a/fortran/src/H5Fff.F90 b/fortran/src/H5Fff.F90
index a273431..ecb40b7 100644
--- a/fortran/src/H5Fff.F90
+++ b/fortran/src/H5Fff.F90
@@ -97,7 +97,7 @@ CONTAINS
     INTEGER(HID_T), INTENT(OUT) :: file_id ! File identifier
     INTEGER, INTENT(OUT) :: hdferr         ! Error code
     INTEGER(HID_T), OPTIONAL, INTENT(IN) :: creation_prp
-                                           ! File creation propertly
+                                           ! File creation property
                                            ! list identifier
     INTEGER(HID_T), OPTIONAL, INTENT(IN) :: access_prp
                                            ! File access property list
diff --git a/fortran/src/H5Gf.c b/fortran/src/H5Gf.c
index f445fee..0201761 100644
--- a/fortran/src/H5Gf.c
+++ b/fortran/src/H5Gf.c
@@ -390,13 +390,13 @@ DONE:
  *  Call H5Glink2 to link the specified type
  * INPUTS
  *  cur_loc_id - identifier of file or group
- *  cur_name - name of the existing object for hard link releative
+ *  cur_name - name of the existing object for hard link relative
  *  to cur_loc_id location,
  *  anything for the soft link
  *  current_namelen - current name length
  *  link_type - link type
  *  new_loc_id - location identifier
- *  new_name - new name for the object releative to the new_loc_id
+ *  new_name - new name for the object relative to the new_loc_id
  *  location
  *  new_namelen - new_name length
  * RETURNS
@@ -879,7 +879,7 @@ done:
  *  February 15, 2008
  * HISTORY
  *
- *  - Added 'mounted' paramater
+ *  - Added 'mounted' parameter
  *  M. Scot Breitenfeld
  *  July 16, 2008
  * SOURCE
@@ -1014,7 +1014,7 @@ done:
  *  February 18, 2008
  * HISTORY
  *
- *  - Added 'mounted' paramater
+ *  - Added 'mounted' parameter
  *    M. Scot Breitenfeld
  *    July 16, 2008
  * SOURCE
diff --git a/fortran/src/H5Gff.F90 b/fortran/src/H5Gff.F90
index 9e7665f..bfca595 100644
--- a/fortran/src/H5Gff.F90
+++ b/fortran/src/H5Gff.F90
@@ -73,7 +73,7 @@ CONTAINS
 !  called C functions (it is needed for Windows
 !  port).  March 5, 2001
 !
-!  Added additional optional paramaters in 1.8
+!  Added additional optional parameters in 1.8
 !  MSB - February 27, 2008
 !
 ! SOURCE
@@ -491,8 +491,8 @@ CONTAINS
     INTEGER, INTENT(OUT) :: hdferr         ! Error code
 !*****
 
-    INTEGER :: current_namelen ! Lenghth of the current_name string
-    INTEGER :: new_namelen     ! Lenghth of the new_name string
+    INTEGER :: current_namelen ! Length of the current_name string
+    INTEGER :: new_namelen     ! Length of the new_name string
 
     INTERFACE
        INTEGER FUNCTION h5glink_c(loc_id, link_type, current_name, &
@@ -524,7 +524,7 @@ CONTAINS
 ! PURPOSE
 !  Creates a link of the specified type from new_name
 !  to current_name. current_name and new_name are interpreted
-!  releative to current and new location identifiers.
+!  relative to current and new location identifiers.
 !
 ! INPUTS
 !  cur_loc_id 	 - location identifier
@@ -559,8 +559,8 @@ CONTAINS
     INTEGER, INTENT(OUT) :: hdferr           ! Error code
 !*****
 
-    INTEGER :: cur_namelen ! Lenghth of the current_name string
-    INTEGER :: new_namelen ! Lenghth of the new_name string
+    INTEGER :: cur_namelen ! Length of the current_name string
+    INTEGER :: new_namelen ! Length of the new_name string
 
     INTERFACE
        INTEGER FUNCTION h5glink2_c(cur_loc_id, cur_name, cur_namelen, &
@@ -617,7 +617,7 @@ CONTAINS
     CHARACTER(LEN=*), INTENT(IN) :: name   ! Name of an object
     INTEGER, INTENT(OUT) :: hdferr         ! Error code
 !*****
-    INTEGER :: namelen ! Lenghth of the name character string
+    INTEGER :: namelen ! Length of the name character string
 
     INTERFACE
        INTEGER FUNCTION h5gunlink_c(loc_id, name, namelen) BIND(C,NAME='h5gunlink_c')
@@ -666,8 +666,8 @@ CONTAINS
     CHARACTER(LEN=*), INTENT(IN) :: new_name ! New name of an object
     INTEGER, INTENT(OUT) :: hdferr           ! Error code
 !*****
-    INTEGER :: namelen         ! Lenghth of the current_name string
-    INTEGER :: new_namelen     ! Lenghth of the new_name string
+    INTEGER :: namelen         ! Length of the current_name string
+    INTEGER :: new_namelen     ! Length of the new_name string
 
     INTERFACE
        INTEGER FUNCTION h5gmove_c(loc_id, name, namelen, new_name, new_namelen) BIND(C,NAME='h5gmove_c')
@@ -715,7 +715,7 @@ CONTAINS
     INTEGER, INTENT(OUT)         :: hdferr      ! Error code
 !*****
     INTEGER :: src_namelen         ! Length of the current_name string
-    INTEGER :: dst_namelen         ! Lenghth of the new_name string
+    INTEGER :: dst_namelen         ! Length of the new_name string
 
     INTERFACE
        INTEGER FUNCTION h5gmove2_c(src_loc_id, src_name, src_namelen, &
@@ -776,7 +776,7 @@ CONTAINS
                                            ! points to
     INTEGER, INTENT(OUT) :: hdferr         ! Error code
 !*****
-    INTEGER :: namelen ! Lenghth of the current_name string
+    INTEGER :: namelen ! Length of the current_name string
 
     INTERFACE
        INTEGER FUNCTION h5gget_linkval_c(loc_id, name, namelen, size, buffer) BIND(C,NAME='h5gget_linkval_c')
@@ -827,8 +827,8 @@ CONTAINS
     CHARACTER(LEN=*), INTENT(IN) :: comment ! New name of an object
     INTEGER, INTENT(OUT) :: hdferr         ! Error code
 !*****
-    INTEGER :: namelen ! Lenghth of the current_name string
-    INTEGER :: commentlen     ! Lenghth of the comment string
+    INTEGER :: namelen ! Length of the current_name string
+    INTEGER :: commentlen     ! Length of the comment string
 
     INTERFACE
        INTEGER FUNCTION h5gset_comment_c(loc_id, name, namelen, &
@@ -1024,7 +1024,7 @@ CONTAINS
 !
 ! HISTORY
 !
-!  - Added 'mounted' paramater
+!  - Added 'mounted' parameter
 !    M. Scot Breitenfeld
 !    July 16, 2008
 !
@@ -1104,7 +1104,7 @@ CONTAINS
 !  February 18, 2008
 !
 ! HISTORY
-!  Added 'mounted' paramater
+!  Added 'mounted' parameter
 !  M. Scot Breitenfeld
 !  July 16, 2008
 !
@@ -1206,7 +1206,7 @@ CONTAINS
 !  February 18, 2008
 !
 ! HISTORY
-!  Added 'mounted' paramater
+!  Added 'mounted' parameter
 !  M. Scot Breitenfeld
 !  July 16, 2008
 ! SOURCE
diff --git a/fortran/src/H5Lff.F90 b/fortran/src/H5Lff.F90
index 3bfcf65..a568824 100644
--- a/fortran/src/H5Lff.F90
+++ b/fortran/src/H5Lff.F90
@@ -469,7 +469,7 @@ CONTAINS
 ! SOURCE
   SUBROUTINE h5ldelete_by_idx_f(loc_id, group_name, index_field, order, n, hdferr, lapl_id)
     IMPLICIT NONE
-    INTEGER(HID_T), INTENT(IN) :: loc_id       ! Identifer for object to which attribute is attached
+    INTEGER(HID_T), INTENT(IN) :: loc_id       ! Identifier for object to which attribute is attached
     CHARACTER(LEN=*), INTENT(IN) :: group_name ! Name of object, relative to location,
                                                !  from which attribute is to be removed
     INTEGER, INTENT(IN) :: index_field         ! Type of index; Possible values are:
@@ -1315,7 +1315,7 @@ CONTAINS
 ! Inputs:
 !  group_id   - Identifier specifying subject group
 !  index_type - Type of index which determines the order:
-!                H5_INDEX_NAME_F      - Alpha-numeric index on name
+!                H5_INDEX_NAME_F      - Alphanumeric index on name
 !                H5_INDEX_CRT_ORDER_F - Index on creation order
 !  order      - Order within index:
 !                H5_ITER_INC_F    - Increasing order
@@ -1391,7 +1391,7 @@ CONTAINS
 !  loc_id     - File or group identifier specifying location of subject group
 !  group_name - Name of subject group
 !  index_type - Type of index which determines the order:
-!                H5_INDEX_NAME_F      - Alpha-numeric index on name
+!                H5_INDEX_NAME_F      - Alphanumeric index on name
 !                H5_INDEX_CRT_ORDER_F - Index on creation order
 !  order      - Order within index:
 !                H5_ITER_INC_F    - Increasing order
diff --git a/fortran/src/H5Pf.c b/fortran/src/H5Pf.c
index 1f74955..ab09ab9 100644
--- a/fortran/src/H5Pf.c
+++ b/fortran/src/H5Pf.c
@@ -145,7 +145,7 @@ done:
  *  plist1_id - property list identifier
  *  plist2_id - property list identifier
  * OUTPUTS
- *  c_flag    - flag to indicate that lists are eqaul
+ *  c_flag    - flag to indicate that lists are equal
  * RETURNS
  *  0 on success, -1 on failure
  * AUTHOR
@@ -936,7 +936,7 @@ h5pset_fapl_stdio_c(hid_t_f *prp_id)
  * NAME
  *  h5pget_fapl_stdio_c
  * PURPOSE
- *  Call H5Pget_fapl_stdio to determine whther the low level file driver
+ *  Call H5Pget_fapl_stdio to determine whether the low level file driver
  *  uses the functions declared in the stdio.h
  * INPUTS
  *  prp_id - property list identifier
@@ -1013,7 +1013,7 @@ h5pset_fapl_sec2_c(hid_t_f *prp_id)
  * NAME
  *  h5pget_fapl_sec2_c
  * PURPOSE
- *  Call H5Pget_fapl_stdio to determine whther the low level file driver
+ *  Call H5Pget_fapl_stdio to determine whether the low level file driver
  *  uses the functions declared in the  unistd.h
  * INPUTS
  *  prp_id - property list identifier
@@ -2186,7 +2186,7 @@ h5pset_fclose_degree_c(hid_t_f *fapl_id, int_f *degree)
  * PURPOSE
  *  Call H5Pset_buffer to set size of conversion buffer
  * INPUTS
- *  prp_id - t`dataset trasfer property list identifier
+ *  prp_id - t`dataset transfer property list identifier
  *  size   - size of the buffer
  * OUTPUTS
  *     NONE
@@ -2221,7 +2221,7 @@ h5pset_buffer_c(hid_t_f *prp_id, hsize_t_f *size)
  * PURPOSE
  *  Call H5Pget_buffer to get size of conversion buffer
  * INPUTS
- *  prp_id - t`dataset trasfer property list identifier
+ *  prp_id - t`dataset transfer property list identifier
  * OUTPUTS
  *  size - size of conversion buffer
  * RETURNS
@@ -3005,11 +3005,11 @@ h5pget_nprops_c(hid_t_f *plist, size_t_f *nprops)
  *  h5pget_class_parent_c
  * PURPOSE
  *  Call H5Pget_class_parent to get the parent class of
- *  a genereic property class
+ *  a generic property class
  * INPUTS
  *  prp_id - property list to query
  * OUTPUTS
- *  parent_id - parent classs identifier
+ *  parent_id - parent class identifier
  * RETURNS
  *  0 on success, -1 on failure
  * AUTHOR
@@ -3505,7 +3505,7 @@ h5pset_family_offset_c(hid_t_f *prp_id, hsize_t_f *offset)
  * NAME
  *  h5pset_fapl_multi_c
  * PURPOSE
- *  Call H5Pset_fapl_multi to set multi file dirver
+ *  Call H5Pset_fapl_multi to set multi file driver
  * INPUTS
  *  prp_id - file_creation property list identifier
  *  mem_map - memory mapping array
@@ -3570,7 +3570,7 @@ h5pset_fapl_multi_c(hid_t_f *prp_id, int_f *memb_map, hid_t_f *memb_fapl, _fcd m
         tmp_p          = tmp_p + c_lenmax;
     }
     /*
-     *  Take care of othe arguments
+     *  Take care of other arguments
      */
     tmp_max_addr = (long double)(HADDR_MAX);
     c_prp_id     = (hid_t)*prp_id;
@@ -3603,7 +3603,7 @@ DONE:
  * NAME
  *  h5pset_fapl_multi_sc
  * PURPOSE
- *  Call H5Pset_fapl_multi to set multi file dirver
+ *  Call H5Pset_fapl_multi to set multi file driver
  * INPUTS
  *  prp_id - file_creation property list identifier
  * RETURNS
@@ -3641,7 +3641,7 @@ h5pset_fapl_multi_sc(hid_t_f *prp_id, int_f *flag)
  * NAME
  *  h5pget_fapl_multi_c
  * PURPOSE
- *  Call H5Pget_fapl_multi to set multi file dirver
+ *  Call H5Pget_fapl_multi to set multi file driver
  * INPUTS
  *  prp_id - file_creation property list identifier
  *  lenmax - length of the name a sdeclared in Fortran
@@ -4607,7 +4607,7 @@ h5pget_copy_object_c(hid_t_f *ocp_plist_id, int_f *copy_options)
  * INPUTS
  *
  *  prp_id - property list identifier to query
- *  expression_len - buffer size transorm expression
+ *  expression_len - buffer size transform expression
  *
  *  Output:
  *  expression - buffer to hold transform expression
@@ -4670,7 +4670,7 @@ done:
  *
  *  prp_id - property list identifier to query
  *  expression - buffer to hold transform expression
- *  expression_len - buffer size transorm expression
+ *  expression_len - buffer size transform expression
  *
  *  Output:
  *
@@ -5478,7 +5478,7 @@ h5pget_fapl_mpio_c(hid_t_f *prp_id, int_f *comm, int_f *info)
  *  h5pset_dxpl_mpio_c
  * PURPOSE
  *  Call H5Pset_dxpl_mpio to set transfer mode of the dataset
- *  trasfer property list
+ *  transfer property list
  * INPUTS
  *  prp_id - property list identifier
  *  data_xfer_mode - transfer mode
@@ -5530,7 +5530,7 @@ h5pset_dxpl_mpio_c(hid_t_f *prp_id, int_f *data_xfer_mode)
  *  h5pget_dxpl_mpio_c
  * PURPOSE
  *  Call H5Pget_dxpl_mpio to get transfer mode of the dataset
- *  trasfer property list
+ *  transfer property list
  * INPUTS
  *  prp_id - property list identifier
  *  data_xfer_mode  - buffer to retrieve transfer mode
diff --git a/fortran/src/H5Pff.F90 b/fortran/src/H5Pff.F90
index a7f2366..c55b7d9 100644
--- a/fortran/src/H5Pff.F90
+++ b/fortran/src/H5Pff.F90
@@ -500,7 +500,7 @@ CONTAINS
 !  a chunked layout dataset.
 !
 ! INPUTS
-!  prp_id  - datatset creation property list identifier
+!  prp_id  - dataset creation property list identifier
 !  ndims   - number of dimensions for each chunk
 !  dims	   - array with dimension sizes for each chunk
 ! OUTPUTS
@@ -1880,7 +1880,7 @@ CONTAINS
 ! INPUTS
 !
 !  prp_id	- file access property list identifier
-!  gc_reference	- flag for stting garbage collection on
+!  gc_reference	- flag for setting garbage collection on
 !		  and off (1 or 0)
 ! OUTPUTS
 !
@@ -1931,7 +1931,7 @@ CONTAINS
 !  prp_id	- file access property list identifier
 ! OUTPUTS
 !
-!  gc_reference	- flag for stting garbage collection on
+!  gc_reference	- flag for setting garbage collection on
 !		  and off (1 or 0)
 !  hdferr       - error code
 !	           Success:  0
@@ -2659,7 +2659,7 @@ CONTAINS
 !  h5pequal_f
 !
 ! PURPOSE
-!  Checks if two property lists are eqaul
+!  Checks if two property lists are equal
 !
 ! INPUTS
 !
@@ -3059,7 +3059,7 @@ CONTAINS
 ! INPUTS
 !
 !  plist_id	- file access property list identifier
-!  size		- metatdata block size
+!  size		- metadata block size
 ! OUTPUTS
 !
 !  hdferr	- error code
@@ -3103,7 +3103,7 @@ CONTAINS
 !  plist_id	- file access property list identifier
 ! OUTPUTS
 !
-!  size		- metatdata block size
+!  size		- metadata block size
 !  hdferr	- error code
 !  		   Success:  0
 !  		   Failure: -1
@@ -3596,7 +3596,7 @@ CONTAINS
 !  h5pget_class_parent_f
 !
 ! PURPOSE
-!  Retrieves the parent class of a genric property class.
+!  Retrieves the parent class of a generic property class.
 !
 ! INPUTS
 !
@@ -5391,7 +5391,7 @@ CONTAINS
 !
 ! HISTORY
 !
-! Should hdferr return just 0 or 1 and add another arguement for the size?
+! Should hdferr return just 0 or 1 and add another argument for the size?
 ! Fortran90 Interface:
 SUBROUTINE h5pget_data_transform_f(plist_id, expression, hdferr, size)
     IMPLICIT NONE
diff --git a/fortran/src/H5Sf.c b/fortran/src/H5Sf.c
index 341acfd..ea42a31 100644
--- a/fortran/src/H5Sf.c
+++ b/fortran/src/H5Sf.c
@@ -388,7 +388,7 @@ done:
  * PURPOSE
  *  Call  H5Sget_select_elem_pointlist
  *  get a list of  element points in the
- *  current dataspace selectin.
+ *  current dataspace selection.
  *  Starting with the startpoint-th point in the
  *  list of points, numpoints points are put into the user's
  *  buffer. If the user's buffer fills up before numpoints
@@ -759,7 +759,7 @@ done:
  *  space_id     - identifier of the dataspace
  *  rank         - dataspace rank
  *  current_size - array with the new dimension sizes
- *  maximum_size - aray with maximum sizes of dimensions
+ *  maximum_size - array with maximum sizes of dimensions
  * RETURNS
  *  0 on success, -1 on failure
  * AUTHOR
@@ -804,7 +804,7 @@ done:
  *  space_id - identifier of the dataspace
  * OUTPUTS
  *  dims    - array with the dimension sizes
- *  maxdims - aray with maximum sizes of dimensions
+ *  maxdims - array with maximum sizes of dimensions
  * RETURNS
  *  number of dataspace dimensions (rank) on success, -1 on failure
  * AUTHOR
@@ -852,7 +852,7 @@ done:
  * NAME
  *  h5sis_simple_c
  * PURPOSE
- *  Call H5Sis_simple to detrmine if the dataspace
+ *  Call H5Sis_simple to determine if the dataspace
  *  is simple.
  * INPUTS
  *  space_id - identifier of the dataspace
diff --git a/fortran/src/H5Sff.F90 b/fortran/src/H5Sff.F90
index 62d665a..76b0dea 100644
--- a/fortran/src/H5Sff.F90
+++ b/fortran/src/H5Sff.F90
@@ -447,7 +447,7 @@ CONTAINS
 ! INPUTS
 !  space_id    - dataspace identifier
 !  startpoint  - element point to start with
-!  num_points  - number of elemnt points to get
+!  num_points  - number of element points to get
 ! OUTPUTS
 !  buf 	       - buffer with element points selected
 !  hdferr      - Returns 0 if successful and -1 if fails
diff --git a/fortran/src/H5Tf.c b/fortran/src/H5Tf.c
index 1516cc7..f3016f1 100644
--- a/fortran/src/H5Tf.c
+++ b/fortran/src/H5Tf.c
@@ -1560,7 +1560,7 @@ h5tget_member_type_c(hid_t_f *type_id, int_f *field_idx, hid_t_f *datatype)
  *  Call H5Tcreate to create a datatype
  * INPUTS
  *  cls - class type
- *  size - size of the class memeber
+ *  size - size of the class member
  * RETURNS
  *  0 on success, -1 on failure
  * AUTHOR
@@ -2033,7 +2033,7 @@ h5tvlen_create_c(hid_t_f *type_id, hid_t_f *vltype_id)
  * NAME
  *  h5tis_variable_str_c
  * PURPOSE
- *  Call H5Tis_variable_str to detrmine if the datatype
+ *  Call H5Tis_variable_str to determine if the datatype
  *  is a variable string.
  * INPUTS
  *  type_id - identifier of the dataspace
@@ -2069,7 +2069,7 @@ h5tis_variable_str_c(hid_t_f *type_id, int_f *flag)
  * NAME
  *  h5tget_member_class_c
  * PURPOSE
- *  Call H5Tget_member_class to detrmine ithe class of the compound
+ *  Call H5Tget_member_class to determine ithe class of the compound
  *		datatype member
  * INPUTS
  *  type_id - identifier of the dataspace
diff --git a/fortran/src/H5Tff.F90 b/fortran/src/H5Tff.F90
index 0eab39e..7582dab 100644
--- a/fortran/src/H5Tff.F90
+++ b/fortran/src/H5Tff.F90
@@ -86,7 +86,7 @@ CONTAINS
 !  called C functions (it is needed for Windows
 !  port).  March 7, 2001
 !
-!  Added optional parameter 'tapl_id' for compatability
+!  Added optional parameter 'tapl_id' for compatibility
 !  with H5Topen2. April 9, 2009.
 !
 ! SOURCE
@@ -212,7 +212,7 @@ CONTAINS
 !  h5tcopy_f
 !
 ! PURPOSE
-!  Creates a copy of exisiting datatype.
+!  Creates a copy of existing datatype.
 !
 ! INPUTS
 !  type_id 	 - datatype identifier
diff --git a/fortran/src/H5_buildiface.F90 b/fortran/src/H5_buildiface.F90
index fb3a002..090b6db 100644
--- a/fortran/src/H5_buildiface.F90
+++ b/fortran/src/H5_buildiface.F90
@@ -14,7 +14,7 @@
 !
 ! NOTES
 !  This program uses the Fortran 2008 intrinsic function STORAGE_SIZE or SIZEOF
-!  depending on availablity.It generates code that makes use of
+!  depending on availability.It generates code that makes use of
 !  STORAGE_SIZE/SIZEOF in H5_gen.F90. STORAGE_SIZE is standard
 !  compliant and should always be chosen over SIZEOF.
 !
@@ -437,7 +437,7 @@ PROGRAM H5_buildiface
 !  dims parameter was added to make code portable;
 !  Aprile 4, 2001
 !
-!  Changed buf intent to INOUT to be consistant
+!  Changed buf intent to INOUT to be consistent
 !  with how the C functions handles it. The pg
 !  compiler will return 0 if a buf value is not set.
 !  February, 2008
@@ -564,7 +564,7 @@ PROGRAM H5_buildiface
 !  dims parameter was added to make code portable;
 !  Aprile 4, 2001
 !
-!  Changed buf intent to INOUT to be consistant
+!  Changed buf intent to INOUT to be consistent
 !  with how the C functions handles it. The pg
 !  compiler will return 0 if a buf value is not set.
 !  February, 2008
@@ -677,7 +677,7 @@ PROGRAM H5_buildiface
 ! Optional parameters:
 !		mem_space_id	- memory dataspace identifier
 !		file_space_id 	- file dataspace identifier
-!		xfer_prp	- trasfer property list identifier
+!		xfer_prp	- transfer property list identifier
 !
 ! AUTHOR
 !  Elena Pourmal
diff --git a/fortran/src/H5_ff.F90 b/fortran/src/H5_ff.F90
index ebf888c..6715314 100644
--- a/fortran/src/H5_ff.F90
+++ b/fortran/src/H5_ff.F90
@@ -700,7 +700,7 @@ CONTAINS
 !
 ! Outputs:
 !  majnum - major version of the library
-!  minum  - minor version of the library
+!  minnum - minor version of the library
 !  relnum - release version of the library
 !  error  - Returns 0 if successful and -1 if fails
 !
@@ -735,7 +735,7 @@ CONTAINS
 !
 ! Inputs:
 !  majnum - major version of the library
-!  minum  - minor version of the library
+!  minnum - minor version of the library
 !  relnum - release version of the library
 !
 ! Outputs:
diff --git a/fortran/src/H5f90global.F90 b/fortran/src/H5f90global.F90
index 0ed8a17..d202547 100644
--- a/fortran/src/H5f90global.F90
+++ b/fortran/src/H5f90global.F90
@@ -853,7 +853,7 @@ CONTAINS
   END SUBROUTINE H5_Fortran_string_f2c
 
 
-! Copy Fortran string to C charater array, assuming the C array is one-char
+! Copy Fortran string to C character array, assuming the C array is one-char
 ! longer for the terminating null char.
 ! fstring : the Fortran input string
 ! cstring : the C output string (with memory already allocated)
@@ -881,7 +881,7 @@ CONTAINS
 !!$    cstring(j) = C_NULL_CHAR
 !!$end subroutine MPIR_Fortran_string_f2c
 !!$
-!!$! Copy C charater array to Fortran string
+!!$! Copy C character array to Fortran string
 !!$subroutine MPIR_Fortran_string_c2f(cstring, fstring)
 !!$    implicit none
 !!$    character(kind=c_char), intent(in) :: cstring(:)
diff --git a/fortran/src/H5f90proto.h b/fortran/src/H5f90proto.h
index fbbf7c2..4aa33f6 100644
--- a/fortran/src/H5f90proto.h
+++ b/fortran/src/H5f90proto.h
@@ -540,7 +540,7 @@ H5_FCDLL int_f h5pget_dxpl_mpio_c(hid_t_f *prp_id, int_f *data_xfer_mode);
 H5_FCDLL int_f h5pset_dxpl_mpio_c(hid_t_f *prp_id, int_f *data_xfer_mode);
 #endif
 /*
- * Functions frome H5Rf.c
+ * Functions from H5Rf.c
  */
 H5_FCDLL int_f h5rcreate_region_c(int_f *ref, hid_t_f *loc_id, _fcd name, int_f *namelen, hid_t_f *space_id);
 H5_FCDLL int_f h5rcreate_ptr_c(void *ref, hid_t_f *loc_id, _fcd name, int_f *namelen, int_f *ref_type,
diff --git a/fortran/src/h5fc.in b/fortran/src/h5fc.in
index a56d38d..661fde5 100644
--- a/fortran/src/h5fc.in
+++ b/fortran/src/h5fc.in
@@ -38,7 +38,7 @@ HL="@HL@"
 ##    $FLINKER $FCFLAGS $H5BLD_FCFLAGS $F9XSUFFIXFLAG $LDFLAGS $LIBS      ##
 ##    $fmodules $link_objs $link_args $shared_link                        ##
 ##                                                                        ##
-## These settings can be overriden by setting HDF5_FCFLAGS,               ##
+## These settings can be overridden by setting HDF5_FCFLAGS,               ##
 ## HDF5_LDFLAGS, or HDF5_LIBS in the environment.                         ##
 ##                                                                        ##
 ############################################################################
@@ -136,7 +136,7 @@ usage() {
   echo "                                           shared libraries]"
   echo " "
   echo " You can also add or change paths and flags to the compile line using"
-  echo " the following environment varibles or by assigning them to their counterparts"
+  echo " the following environment variables or by assigning them to their counterparts"
   echo " in the 'Things You Can Modify to Override...'" section of $prog_name
   echo " "
   echo "  Variable              Current value to be replaced"
@@ -298,7 +298,7 @@ fi
 
 if test "x$do_link" = "xyes"; then
   shared_link=""
-# conditionnaly link with the hl library
+# conditionally link with the hl library
   if test "X$HL" = "Xhl"; then
    libraries=" $libraries -lhdf5hl_fortran -lhdf5_hl -lhdf5_fortran -lhdf5 "
   else
diff --git a/fortran/test/H5_test_buildiface.F90 b/fortran/test/H5_test_buildiface.F90
index 94beab1..302fa38 100644
--- a/fortran/test/H5_test_buildiface.F90
+++ b/fortran/test/H5_test_buildiface.F90
@@ -14,7 +14,7 @@
 !
 ! NOTES
 !  This program uses the Fortran 2008 intrinsic function STORAGE_SIZE or SIZEOF
-!  depending on availablity.It generates code that makes use of
+!  depending on availability.It generates code that makes use of
 !  STORAGE_SIZE/SIZEOF in H5fortran_detect.f90. STORAGE_SIZE is standard
 !  compliant and should always be chosen over SIZEOF.
 !
diff --git a/fortran/test/fflush1.F90 b/fortran/test/fflush1.F90
index c192d93..5684f81 100644
--- a/fortran/test/fflush1.F90
+++ b/fortran/test/fflush1.F90
@@ -88,7 +88,7 @@
      data_dims(2) = NY
 
      !
-     !Initialize FORTRAN predifined datatypes
+     !Initialize FORTRAN predefined datatypes
      !
      CALL h5open_f(error)
           CALL check("h5open_f",error,total_error)
diff --git a/fortran/test/fflush2.F90 b/fortran/test/fflush2.F90
index dc3bc85..a6e16c1 100644
--- a/fortran/test/fflush2.F90
+++ b/fortran/test/fflush2.F90
@@ -81,7 +81,7 @@ PROGRAM FFLUSH2EXAMPLE
   data_dims(2) = NY
 
   !
-  !Initialize FORTRAN predifined datatypes
+  !Initialize FORTRAN predefined datatypes
   !
   CALL h5open_f(error)
   CALL check("h5open_f",error,total_error)
@@ -163,7 +163,7 @@ PROGRAM FFLUSH2EXAMPLE
   CALL check("h5fclose_f",error,total_error)
 
   !
-  !Close FORTRAN predifined datatypes
+  !Close FORTRAN predefined datatypes
   !
   CALL h5_cleanup_f(filename, H5P_DEFAULT_F, error)
   CALL h5close_f(error)
diff --git a/fortran/test/tH5A.F90 b/fortran/test/tH5A.F90
index d5ce9a2..2e76dad 100644
--- a/fortran/test/tH5A.F90
+++ b/fortran/test/tH5A.F90
@@ -81,7 +81,7 @@ CONTAINS
      INTEGER(HID_T) :: atype5_id      !Integer Attribute Datatype identifier
      INTEGER(HSIZE_T), DIMENSION(1) :: adims = (/2/) ! Attribute dimension
      INTEGER(HSIZE_T), DIMENSION(1) :: adims2 = (/1/) ! Attribute dimension
-     INTEGER     ::   arank = 1                      ! Attribure rank
+     INTEGER     ::   arank = 1                      ! Attribute rank
      INTEGER(SIZE_T) :: attrlen    ! Length of the attribute string
 
      INTEGER(HID_T) :: attr_space     !Returned String Attribute Space identifier
diff --git a/fortran/test/tH5A_1_8.F90 b/fortran/test/tH5A_1_8.F90
index 4e02c58..cd8a981 100644
--- a/fortran/test/tH5A_1_8.F90
+++ b/fortran/test/tH5A_1_8.F90
@@ -64,7 +64,7 @@ SUBROUTINE attribute_test_1_8(cleanup, total_error)
   INTEGER :: ret_total_error
 
 ! ********************
-! test_attr equivelent
+! test_attr equivalent
 ! ********************
 
 !  WRITE(*,*) "TESTING ATTRIBUTES"
@@ -776,8 +776,7 @@ SUBROUTINE test_attr_info_by_idx(new_format, fcpl, fapl, total_error)
 
   INTEGER :: Input1
   INTEGER(HSIZE_T) :: hzero = 0_HSIZE_T
-  INTEGER :: minusone = -1
-  INTEGER(HSIZE_T) :: htmp
+  INTEGER, PARAMETER :: minusone = -1
 
   data_dims = 0
 
@@ -840,10 +839,6 @@ SUBROUTINE test_attr_info_by_idx(new_format, fcpl, fapl, total_error)
            my_dataset = dset3
         END SELECT
 
-        !  Check for query on non-existant attribute
-
-        n = 0
-
         ! -- CHECK PASSING AN INTEGER CONSTANT IN DIFFERENT FORMS --
 
         ! 1) call by passing an integer with the _hsize_t declaration
@@ -896,8 +891,8 @@ SUBROUTINE test_attr_info_by_idx(new_format, fcpl, fapl, total_error)
            !  Verify information for new attribute
 
 !EP        CALL attr_info_by_idx_check(my_dataset, attrname, INT(j,HSIZE_T), use_index(i), total_error )
-           htmp = j
-           CALL attr_info_by_idx_check(my_dataset, attrname, htmp, use_index(i), total_error )
+           n = INT(j, HSIZE_T)
+           CALL attr_info_by_idx_check(my_dataset, attrname, n, use_index(i), total_error )
 
            !CHECK(ret, FAIL, "attr_info_by_idx_check");
         ENDDO
@@ -1111,7 +1106,7 @@ SUBROUTINE test_attr_shared_rename( fcpl, fapl, total_error)
 
   INTEGER :: test_shared
   INTEGER(HSIZE_T), DIMENSION(1) :: adims2 = (/1/) ! Attribute dimension
-  INTEGER     ::   arank = 1                      ! Attribure rank
+  INTEGER     ::   arank = 1                      ! Attribute rank
 
   !  Initialize "big" attribute data
 
@@ -1427,7 +1422,7 @@ SUBROUTINE test_attr_delete_by_idx(new_format, fcpl, fapl, total_error)
   INTEGER :: u     !  Local index variable
   INTEGER :: Input1
   INTEGER(HSIZE_T) :: hzero = 0_HSIZE_T
-  INTEGER :: minusone = -1
+  INTEGER, PARAMETER :: minusone = -1
 
   data_dims = 0
 
@@ -1497,7 +1492,7 @@ SUBROUTINE test_attr_delete_by_idx(new_format, fcpl, fapl, total_error)
               END SELECT
 
 
-              !  Check for deleting non-existant attribute
+              !  Check for deleting non-existent attribute
 !EP              CALL H5Adelete_by_idx_f(my_dataset, '.', idx_type, order, 0_HSIZE_T,error, lapl_id=H5P_DEFAULT_F)
               CALL H5Adelete_by_idx_f(my_dataset, '.', idx_type, order, hzero,error, lapl_id=H5P_DEFAULT_F)
               CALL verify("H5Adelete_by_idx_f",error,minusone,total_error)
@@ -1773,7 +1768,7 @@ SUBROUTINE test_attr_shared_delete(fcpl, fapl, total_error)
 
   INTEGER :: test_shared
   INTEGER(HSIZE_T), DIMENSION(1) :: adims2 = (/1/) ! Attribute dimension
-  INTEGER     ::   arank = 1                      ! Attribure rank
+  INTEGER     ::   arank = 1                      ! Attribute rank
 
   !  Output message about test being performed
 
@@ -2268,7 +2263,7 @@ SUBROUTINE test_attr_corder_create_basic( fcpl, fapl, total_error )
   INTEGER :: error
 
   INTEGER :: crt_order_flags
-  INTEGER :: minusone = -1
+  INTEGER, PARAMETER :: minusone = -1
 
   !  Output message about test being performed
 !  WRITE(*,*) "     - Testing Basic Code for Attributes with Creation Order Info"
diff --git a/fortran/test/tH5D.F90 b/fortran/test/tH5D.F90
index 006d62a..eb9e831 100644
--- a/fortran/test/tH5D.F90
+++ b/fortran/test/tH5D.F90
@@ -187,7 +187,7 @@ CONTAINS
     DO i = 1, 4
        DO j = 1, 6
           IF (data_out(i,j) .NE. dset_data(i, j)) THEN
-             WRITE(*, *) "dataset test error occured"
+             WRITE(*, *) "dataset test error occurred"
              WRITE(*,*) "data read is not the same as the data written"
           END IF
        END DO
@@ -196,7 +196,7 @@ CONTAINS
     ! Check if no change to null_dset_data
     !
     IF (null_dset_data .NE. 1) THEN
-       WRITE(*, *) "null dataset test error occured"
+       WRITE(*, *) "null dataset test error occurred"
     END IF
     !
     ! End access to the dataset and release resources used by it.
@@ -258,7 +258,7 @@ CONTAINS
     INTEGER(HID_T) :: dset_id       ! Dataset identifier
     INTEGER(HID_T) :: dataspace     ! Dataspace identifier
     INTEGER(HID_T) :: memspace      ! memory Dataspace identifier
-    INTEGER(HID_T) :: crp_list        ! dataset creatation property identifier
+    INTEGER(HID_T) :: crp_list        ! dataset creation property identifier
 
     !
     !dataset dimensions at creation time
@@ -313,7 +313,7 @@ CONTAINS
     END DO
 
     !
-    !Initialize FORTRAN predifined datatypes
+    !Initialize FORTRAN predefined datatypes
     !
 !          CALL h5init_types_f(error)
 !               CALL check("h5init_types_f",error,total_error)
@@ -347,7 +347,7 @@ CONTAINS
     CALL check("h5pset_chunk_f",error,total_error)
 
     !
-    !Create a dataset with 3X3 dimensions using cparms creation propertie .
+    !Create a dataset with 3X3 dimensions using cparms creation properties .
     !
     CALL h5dcreate_f(file_id, dsetname, H5T_NATIVE_INTEGER, dataspace, dset_id, error, crp_list )
     CALL check("h5dcreate_f",error,total_error)
@@ -426,7 +426,7 @@ CONTAINS
     CALL h5sget_simple_extent_ndims_f(dataspace, rankr, error)
     CALL check("h5sget_simple_extent_ndims_f",error,total_error)
     IF (rankr .NE. RANK) THEN
-       WRITE(*,*) "dataset rank error occured"
+       WRITE(*,*) "dataset rank error occurred"
        STOP
     END IF
 
@@ -436,7 +436,7 @@ CONTAINS
     CALL h5sget_simple_extent_dims_f(dataspace, dimsr, maxdimsr, error)
     CALL check("h5sget_simple_extent_dims_f",error,total_error)
     IF ((dimsr(1) .NE. dims1(1)) .OR. (dimsr(2) .NE. dims1(2))) THEN
-       WRITE(*,*) "dataset dimensions error occured"
+       WRITE(*,*) "dataset dimensions error occurred"
        STOP
     END IF
 
@@ -466,7 +466,7 @@ CONTAINS
     DO ih = 1, dims1(1)
        DO jh = 1, dims1(2)
           IF (data_out(ih,jh) .NE. data_in(ih, jh)) THEN
-             WRITE(*, *) "extend dataset test error occured"
+             WRITE(*, *) "extend dataset test error occurred"
              WRITE(*, *) "read value is not the same as the written values"
           END IF
        END DO
diff --git a/fortran/test/tH5F.F90 b/fortran/test/tH5F.F90
index 06dc6de..8d4845d 100644
--- a/fortran/test/tH5F.F90
+++ b/fortran/test/tH5F.F90
@@ -554,7 +554,7 @@ CONTAINS
           do i = 1, NX
               do j = 1, NY
                   IF (data_out(i,j) .NE. dset_data(i, j)) THEN
-                      write(*, *) "reopen test error occured"
+                      write(*, *) "reopen test error occurred"
                   END IF
               end do
           end do
@@ -584,17 +584,23 @@ CONTAINS
 !    The following subroutine checks that h5fget_name_f produces
 !    correct output for a given obj_id and filename.
 !
-        SUBROUTINE check_get_name(obj_id, fix_filename, total_error)
+        SUBROUTINE check_get_name(obj_id, fix_filename, len_filename, total_error)
           USE HDF5  ! This module contains all necessary modules
           USE TH5_MISC
           IMPLICIT NONE
           INTEGER(HID_T) :: obj_id                          ! Object identifier
           CHARACTER(LEN=80), INTENT(IN) :: fix_filename     ! Expected filename
+          INTEGER, INTENT(IN) :: len_filename               ! The length of the filename
           INTEGER, INTENT(INOUT) :: total_error             ! Error count
 
           CHARACTER(LEN=80):: file_name  ! Filename buffer
           INTEGER:: error                ! HDF5 error code
           INTEGER(SIZE_T):: name_size    ! Filename length
+
+          INTEGER, PARAMETER :: sm_len = 2
+          CHARACTER(LEN=len_filename) :: filename_exact
+          CHARACTER(LEN=len_filename-sm_len) :: filename_sm
+
           !
           !Get file name from the dataset identifier
           !
@@ -637,6 +643,30 @@ CONTAINS
             total_error = total_error + 1
          END IF
 
+         ! Use a buffer which is the exact size needed to hold the filename
+         CALL h5fget_name_f(obj_id, filename_exact, name_size, error)
+         CALL check("h5fget_name_f",error,total_error)
+         IF(name_size .NE. len_filename)THEN
+            WRITE(*,*) "  file name size obtained from the object id is incorrect"
+            total_error = total_error + 1
+         ENDIF
+         IF(filename_exact .NE. TRIM(fix_filename)) THEN
+            WRITE(*,*) "  file name obtained from the object id is incorrect"
+            total_error = total_error + 1
+         END IF
+
+         ! Use a buffer which is smaller than needed to hold the filename
+         CALL h5fget_name_f(obj_id, filename_sm, name_size, error)
+         CALL check("h5fget_name_f",error,total_error)
+         IF(name_size .NE. len_filename)THEN
+            WRITE(*,*) "  file name size obtained from the object id is incorrect"
+            total_error = total_error + 1
+         ENDIF
+         IF(filename_sm(1:len_filename-sm_len) .NE. fix_filename(1:len_filename-sm_len)) THEN
+            WRITE(*,*) "  file name obtained from the object id is incorrect"
+            total_error = total_error + 1
+         END IF
+
         END SUBROUTINE check_get_name
 
 !    The following subroutine tests h5fget_name_f.
@@ -653,6 +683,7 @@ CONTAINS
 
           CHARACTER(LEN=*), PARAMETER :: filename = "filename"
           CHARACTER(LEN=80)  :: fix_filename
+          INTEGER :: len_filename
 
           INTEGER(HID_T) :: file_id          ! File identifier
           INTEGER(HID_T) :: g_id             ! Group identifier
@@ -679,8 +710,9 @@ CONTAINS
           CALL h5gopen_f(file_id,"/",g_id, error)
           CALL check("h5gopen_f",error,total_error)
 
-          CALL check_get_name(file_id, fix_filename, total_error)
-          CALL check_get_name(g_id, fix_filename, total_error)
+          len_filename = LEN_TRIM(fix_filename)
+          CALL check_get_name(file_id, fix_filename, len_filename, total_error)
+          CALL check_get_name(g_id, fix_filename, len_filename, total_error)
 
           ! Close the group.
           !
diff --git a/fortran/test/tH5G_1_8.F90 b/fortran/test/tH5G_1_8.F90
index 534a2d4..222ba9d 100644
--- a/fortran/test/tH5G_1_8.F90
+++ b/fortran/test/tH5G_1_8.F90
@@ -654,7 +654,7 @@ SUBROUTINE group_info(cleanup, fapl, total_error)
      INTEGER(HID_T) :: file, scalar, grp, d1
      CHARACTER(LEN=12), PARAMETER :: filename ='TestLinks.h5'
      INTEGER(HSIZE_T), DIMENSION(1) :: adims2 = (/1/) ! Attribute dimension
-     INTEGER ::   arank = 1                      ! Attribure rank
+     INTEGER ::   arank = 1                      ! Attribute rank
      INTEGER :: error
 
      INTEGER :: cset ! Indicates the character set used for the link’s name.
diff --git a/fortran/test/tH5MISC_1_8.F90 b/fortran/test/tH5MISC_1_8.F90
index c294f21..e35ef1f 100644
--- a/fortran/test/tH5MISC_1_8.F90
+++ b/fortran/test/tH5MISC_1_8.F90
@@ -160,7 +160,7 @@ SUBROUTINE test_genprop_basic_class(total_error)
   CALL verify("H5Pequal_f", flag, .TRUE., total_error)
 
 
-  !  Make certain false postives aren't being returned
+  !  Make certain false positives aren't being returned
   CALL H5Pequal_f(cid2, H5P_FILE_CREATE_F, flag, error)
   CALL check("H5Pequal_f", error, total_error)
   CALL verify("H5Pequal_f", flag, .FALSE., total_error)
diff --git a/fortran/test/tH5P.F90 b/fortran/test/tH5P.F90
index 1d1208c..d664dd7 100644
--- a/fortran/test/tH5P.F90
+++ b/fortran/test/tH5P.F90
@@ -349,8 +349,8 @@ SUBROUTINE multi_file_test(cleanup, total_error)
   DO i = 1, 4
      DO j = 1, 6
         IF (data_out(i,j) .NE. dset_data(i, j)) THEN
-           WRITE(*, *) "dataset test error occured"
-           WRITE(*,*) "data read is not the same as the data writen"
+           WRITE(*, *) "dataset test error occurred"
+           WRITE(*,*) "data read is not the same as the data written"
         END IF
      END DO
   END DO
@@ -541,7 +541,7 @@ SUBROUTINE test_chunk_cache(cleanup, total_error)
   CALL H5Dclose_f(dsid, error)
   CALL H5Oopen_f(fid, "dset", dsid, error, dapl1)
 
-  ! Retrieve dapl from dataset, verfiy cache values are the same as on dapl1
+  ! Retrieve dapl from dataset, verify cache values are the same as on dapl1
   !
   ! Note we rely on the knowledge that H5Pget_chunk_cache retrieves these
   ! values directly from the dataset structure, and not from a copy of the
@@ -563,7 +563,7 @@ SUBROUTINE test_chunk_cache(cleanup, total_error)
   CALL H5Oopen_f(fid, "dset", dsid, error)
   CALL check("H5Oopen_f", error, total_error)
 
-  ! Retrieve dapl from dataset, verfiy cache values are the same as on fapl_local
+  ! Retrieve dapl from dataset, verify cache values are the same as on fapl_local
 
   CALL H5Dget_access_plist_f(dsid, dapl2, error)
   CALL check("H5Dget_access_plist_f", error, total_error)
@@ -575,7 +575,7 @@ SUBROUTINE test_chunk_cache(cleanup, total_error)
   CALL H5Pclose_f(dapl2,error)
   CALL check("H5Pclose_f", error, total_error)
 
-  ! Similary, test use of H5Dcreate2 with H5P_DEFAULT
+  ! Similarly, test use of H5Dcreate2 with H5P_DEFAULT
   CALL H5Dclose_f(dsid, error)
   CALL check("H5Dclose_f", error, total_error)
 
diff --git a/fortran/test/tH5R.F90 b/fortran/test/tH5R.F90
index 5144d83..4e62b20 100644
--- a/fortran/test/tH5R.F90
+++ b/fortran/test/tH5R.F90
@@ -142,7 +142,7 @@ SUBROUTINE refobjtest(cleanup, total_error)
   CALL check("h5gclose_f",error,total_error)
 
   !
-  ! Craete references to two groups, integer dataset and shared datatype
+  ! Create references to two groups, integer dataset and shared datatype
   ! and write it to the dataset in the file
   !
   CALL h5rcreate_f(file_id, groupname1, ref(1), error)
diff --git a/fortran/test/tH5S.F90 b/fortran/test/tH5S.F90
index 08f0b59..302db51 100644
--- a/fortran/test/tH5S.F90
+++ b/fortran/test/tH5S.F90
@@ -151,7 +151,7 @@ CONTAINS
           CALL h5sget_simple_extent_dims_f(space2_id, dimsout, maxdimsout, error)
               CALL check("h5sget_simple_extent_dims_f", error, total_error)
           IF ((dimsout(1) .NE. dims1(1)) .OR. (dimsout(2) .NE. dims1(2)) ) THEN
-              write(*,*)"error occured, copied dims not same"
+              write(*,*)"error occurred, copied dims not same"
           END IF
 
           !
@@ -159,14 +159,14 @@ CONTAINS
           !
           CALL h5sget_simple_extent_ndims_f(space2_id, rank2, error)
               CALL check("h5sget_simple_extent_ndims_f", error, total_error)
-          IF (rank2 .NE. rank1) write(*,*)"error occured, copied ranks not same"
+          IF (rank2 .NE. rank1) write(*,*)"error occurred, copied ranks not same"
 
           !
           !get the copied space's number of elements.
           !
           CALL h5sget_simple_extent_npoints_f(space2_id, npoints, error)
               CALL check("h5sget_simple_extent_npoints_f", error, total_error)
-          IF (npoints .NE. 24) write(*,*)"error occured, number of elements not correct"
+          IF (npoints .NE. 24) write(*,*)"error occurred, number of elements not correct"
 
 
           !
@@ -194,7 +194,7 @@ CONTAINS
           CALL h5sget_simple_extent_dims_f(space2_id, dimsout, maxdimsout, error)
               CALL check("h5sget_simple_extent_dims_f", error, total_error)
           IF ((dimsout(1) .NE. dims2(1)) .OR. (dimsout(2) .NE. dims2(2)) ) THEN
-              write(*,*)"error occured, copied dims not same"
+              write(*,*)"error occurred, copied dims not same"
           END IF
 
           !
@@ -235,8 +235,8 @@ CONTAINS
           do i = 1, 4
               do j = 1, 6
                   IF (data1_out(i,j) .NE. data1_in(i, j)) THEN
-                      write(*, *) "dataset test error occured"
-                      write(*,*) "data read is not the same as the data writen"
+                      write(*, *) "dataset test error occurred"
+                      write(*,*) "data read is not the same as the data written"
                   END IF
               end do
           end do
@@ -256,8 +256,8 @@ CONTAINS
           do i = 1, 6
               do j = 1, 6
                   IF (data2_out(i,j) .NE. data2_in(i, j)) THEN
-                      write(*, *) "dataset test error occured"
-                      write(*,*) "data read is not the same as the data writen"
+                      write(*, *) "dataset test error occurred"
+                      write(*,*) "data read is not the same as the data written"
                   END IF
               end do
           end do
diff --git a/fortran/test/tH5Sselect.F90 b/fortran/test/tH5Sselect.F90
index 178ac32..41cd16f 100644
--- a/fortran/test/tH5Sselect.F90
+++ b/fortran/test/tH5Sselect.F90
@@ -149,7 +149,7 @@ CONTAINS
     !
 
     !
-    !Initialize FORTRAN predifined datatypes
+    !Initialize FORTRAN predefined datatypes
     !
 !    CALL h5init_types_f(error)
 !    CALL check("h5init_types_f", error, total_error)
@@ -430,7 +430,7 @@ CONTAINS
     end do
 
     !
-    !Initialize FORTRAN predifined datatypes
+    !Initialize FORTRAN predefined datatypes
     !
 !    CALL h5init_types_f(error)
 !    CALL check("h5init_types_f", error, total_error)
@@ -912,7 +912,7 @@ CONTAINS
      !
      CALL h5sget_select_hyper_nblocks_f(dataspace, num_blocks, error)
      CALL check("h5sget_select_hyper_nblocks_f", error, total_error)
-     IF (num_blocks .NE. 4) write (*,*) "error occured with num_blocks"
+     IF (num_blocks .NE. 4) write (*,*) "error occurred with num_blocks"
      !write(*,*) num_blocks
      !result of num_blocks is 4
 
@@ -945,11 +945,11 @@ CONTAINS
      CALL h5sget_select_bounds_f(dataspace, startout, endout, error)
      CALL check("h5sget_select_bounds_f", error, total_error)
      IF ( (startout(1) .ne. 1) .or. (startout(2) .ne. 1) ) THEN
-        write(*,*) "error occured to select_bounds's start position"
+        write(*,*) "error occurred to select_bounds's start position"
      END IF
 
      IF ( (endout(1) .ne. 5) .or. (endout(2) .ne. 5) ) THEN
-        write(*,*) "error occured to select_bounds's end position"
+        write(*,*) "error occurred to select_bounds's end position"
      END IF
      !write(*,*) (startout(i), i = 1, RANK)
      !result of startout is 0, 0
@@ -978,7 +978,7 @@ CONTAINS
      !
      CALL h5sget_select_elem_npoints_f(dataspace, num_points, error)
      CALL check("h5sget_select_elem_npoints_f", error, total_error)
-     IF (num_points .NE. 10) write(*,*) "error occured with num_points"
+     IF (num_points .NE. 10) write(*,*) "error occurred with num_points"
      !write(*,*) num_points
      ! result of num_points is 10
 
diff --git a/fortran/test/tH5T.F90 b/fortran/test/tH5T.F90
index 8b10136..d24ac89 100644
--- a/fortran/test/tH5T.F90
+++ b/fortran/test/tH5T.F90
@@ -72,7 +72,7 @@ CONTAINS
      INTEGER(HID_T) :: dt4_id      ! Memory datatype identifier (for real field)
      INTEGER(HID_T) :: dt5_id      ! Memory datatype identifier
      INTEGER(HID_T) :: membtype_id ! Datatype identifier
-     INTEGER(HID_T) :: plist_id    ! Dataset trasfer property
+     INTEGER(HID_T) :: plist_id    ! Dataset transfer property
 
 
      INTEGER(HSIZE_T), DIMENSION(1) :: dims = (/dimsize/) ! Dataset dimensions
@@ -98,7 +98,7 @@ CONTAINS
      INTEGER :: class ! Datatype class
      INTEGER :: num_members ! Number of members in the compound datatype
      CHARACTER(LEN=256) :: member_name
-     INTEGER :: len ! Lenght of the name of the compound datatype member
+     INTEGER :: len ! Length of the name of the compound datatype member
      INTEGER :: member_index ! index of the field
      INTEGER(HSIZE_T), DIMENSION(3) :: array_dims=(/2,3,4/)
      INTEGER :: array_dims_range = 3
@@ -219,9 +219,9 @@ CONTAINS
      CALL h5tcreate_f(H5T_COMPOUND_F, type_size, dtype_id, error)
      CALL check("h5tcreate_f", error, total_error)
      !
-     ! Insert memebers
+     ! Insert members
      !
-     ! CHARACTER*2 memeber
+     ! CHARACTER*2 member
      !
      offset = 0
      CALL h5tinsert_f(dtype_id, "char_field", offset, dt5_id, error)
@@ -229,13 +229,13 @@ CONTAINS
      !
      ! INTEGER member
      !
-     offset = offset + type_sizec ! Offset of the second memeber is 2
+     offset = offset + type_sizec ! Offset of the second member is 2
      CALL h5tinsert_f(dtype_id, "integer_field", offset, H5T_NATIVE_INTEGER, error)
      CALL check("h5tinsert_f", error, total_error)
      !
      ! DOUBLE PRECISION member
      !
-     offset = offset + type_sizei  ! Offset of the third memeber is 6
+     offset = offset + type_sizei  ! Offset of the third member is 6
      CALL h5tinsert_f(dtype_id, "double_field", offset, H5T_NATIVE_DOUBLE, error)
      CALL check("h5tinsert_f", error, total_error)
      !
@@ -416,7 +416,7 @@ CONTAINS
          CALL h5tequal_f(membtype_id, H5T_NATIVE_INTEGER, flag, error)
           CALL check("h5tequal_f", error, total_error)
              if(.not. flag) then
-                write(*,*) "Wrong member type returned for integer memebr"
+                write(*,*) "Wrong member type returned for integer member"
                 total_error = total_error + 1
              endif
          CALL h5tget_member_class_f(dtype_id, i-1, class, error)
@@ -435,7 +435,7 @@ CONTAINS
          CALL h5tequal_f(membtype_id, H5T_NATIVE_DOUBLE, flag, error)
           CALL check("h5tequal_f", error, total_error)
              if(.not. flag) then
-                write(*,*) "Wrong member type returned for double precision memebr"
+                write(*,*) "Wrong member type returned for double precision member"
                 total_error = total_error + 1
              endif
          CALL h5tget_member_class_f(dtype_id, i-1, class, error)
@@ -454,7 +454,7 @@ CONTAINS
          CALL h5tequal_f(membtype_id, H5T_NATIVE_REAL, flag, error)
           CALL check("h5tequal_f", error, total_error)
              if(.not. flag) then
-                write(*,*) "Wrong member type returned for real memebr"
+                write(*,*) "Wrong member type returned for real member"
                 total_error = total_error + 1
              endif
          CALL h5tget_member_class_f(dtype_id, i-1, class, error)
diff --git a/fortran/test/tH5VL.F90 b/fortran/test/tH5VL.F90
index 2269fec..eb0470c 100644
--- a/fortran/test/tH5VL.F90
+++ b/fortran/test/tH5VL.F90
@@ -147,7 +147,7 @@ CONTAINS
               CALL check("h5dvlen_get_max_len_f", error, total_error)
               if(max_len .ne. data_dims(1)) then
                       total_error = total_error + 1
-                      write(*,*) "Wrong number of elemets returned by h5dvlen_get_max_len_f"
+                      write(*,*) "Wrong number of elements returned by h5dvlen_get_max_len_f"
               endif
           !
           ! Read the dataset.
@@ -317,7 +317,7 @@ CONTAINS
               CALL check("h5dvlen_get_max_len_f", error, total_error)
               if(max_len .ne. data_dims(1)) then
                       total_error = total_error + 1
-                      write(*,*) "Wrong number of elemets returned by h5dvlen_get_max_len_f"
+                      write(*,*) "Wrong number of elements returned by h5dvlen_get_max_len_f"
               endif
           !
           ! Read the dataset.
diff --git a/fortran/test/tH5Z.F90 b/fortran/test/tH5Z.F90
index 8c39fea..799067a 100644
--- a/fortran/test/tH5Z.F90
+++ b/fortran/test/tH5Z.F90
@@ -374,7 +374,7 @@ CONTAINS
           do i = 1, N
               do j = 1, M
                   IF (data_out(i,j) .NE. dset_data(i, j)) THEN
-                      write(*, *) "dataset test error occured"
+                      write(*, *) "dataset test error occurred"
                       write(*,*) "data read is not the same as the data written"
                       num_errors = num_errors + 1
                       IF (num_errors .GE. 512) THEN