diff --git a/config/ompi_ext.m4 b/config/ompi_ext.m4
index 72f47d390d..2821048ed2 100644
--- a/config/ompi_ext.m4
+++ b/config/ompi_ext.m4
@@ -409,7 +409,7 @@ AC_DEFUN([EXT_CONFIGURE_M4_CONFIG_COMPONENT],[
 # - c/libmpiext_<component>.la: convneience library slurped into libmpi.la
 #
 # mpi.f.h:
-# - mpif-h/mpiext_<component>_mpifh.h: is included mpi mpif_ext.h
+# - mpif-h/<component>_mpifh.h: is included mpi mpif_ext.h
 # - mpif-h/libmpiext_<component>_mpifh.la: convenience library slurped
 #   into libmpi_mpifh.la
 #
@@ -497,7 +497,7 @@ EOF
     # Test if this extension has mpif.h bindings
     # If not, skip this step.
     #
-    test_header="${srcdir}/ompi/mpiext/$component/mpif-h/mpiext_${component}_mpifh.h"
+    test_header="${srcdir}/ompi/mpiext/$component/mpif-h/${component}_mpifh.h"
     enabled_mpifh=0
 
     AC_MSG_CHECKING([if MPI Extension $component has mpif.h bindings])
@@ -507,10 +507,10 @@ EOF
         enabled_mpifh=1
 
     # JMS Where is this needed?
-        EXT_MPIFH_HEADERS="$EXT_MPIFH_HEADERS mpiext/$component/mpif-h/mpiext_${component}_mpifh.h"
+        EXT_MPIFH_HEADERS="$EXT_MPIFH_HEADERS mpiext/${component}_mpifh.h"
         $4="$$4 $component"
 
-        component_header="mpiext_${component}_mpifh.h"
+        component_header="${component}_mpifh.h"
 
         cat >> $mpif_ext_h <<EOF
 !
@@ -519,7 +519,7 @@ EOF
       integer $component_define
       parameter ($component_define=1)
 
-      include 'openmpi/ompi/mpiext/$component/mpif-h/$component_header'
+      include 'openmpi/ompi/mpiext/$component_header'
 
 EOF
     else
@@ -566,7 +566,7 @@ EOF
         # srcdir is needed to find the header.
         #
         if test "$enabled_mpifh" = 1; then
-            mpifh_component_header="mpiext_${component}_mpifh.h"
+            mpifh_component_header="${component}_mpifh.h"
             cat >> $mpiusempi_ext_h <<EOF
 #include "${srcdir}/ompi/mpiext/$component/mpif-h/$mpifh_component_header"
 EOF
@@ -619,7 +619,7 @@ EOF
         # the srcdir is needed to find the header.
         #
         if test "$enabled_mpifh" = 1; then
-            mpifh_component_header="mpiext_${component}_mpifh.h"
+            mpifh_component_header="${component}_mpifh.h"
             cat >> $mpiusempif08_ext_h <<EOF
 #include "${srcdir}/ompi/mpiext/$component/mpif-h/$mpifh_component_header"
 EOF
diff --git a/ompi/mpiext/example/mpif-h/Makefile.am b/ompi/mpiext/example/mpif-h/Makefile.am
index fdd1c2a257..9a6617a5b4 100644
--- a/ompi/mpiext/example/mpif-h/Makefile.am
+++ b/ompi/mpiext/example/mpif-h/Makefile.am
@@ -4,6 +4,8 @@
 #                         Corporation.  All rights reserved.
 # Copyright (c) 2011      Oak Ridge National Labs.  All rights reserved.
 # Copyright (c) 2011-2012 Cisco Systems, Inc.  All rights reserved.
+# Copyright (c) 2018      Research Organization for Information Science
+#                         and Technology (RIST).  All rights reserved.
 # $COPYRIGHT$
 #
 # Additional copyrights may follow
@@ -26,7 +28,7 @@ noinst_LTLIBRARIES =
 
 # Directory where the header file to be included in mpif-ext.h must be
 # installed.
-ompidir = $(ompiincludedir)/ompi/mpiext/example/mpif-h
+ompidir = $(ompiincludedir)/ompi/mpiext
 
 # Just like noinst_LTLIBRARIES, set this macro to empty and
 # conditionally add to it later.
@@ -41,7 +43,7 @@ if OMPI_BUILD_FORTRAN_MPIFH_BINDINGS
 noinst_LTLIBRARIES += libmpiext_example_mpifh.la
 
 # This is the header file that is installed.
-ompi_HEADERS += mpiext_example_mpifh.h
+ompi_HEADERS += example_mpifh.h
 
 # Sources for the convenience libtool library.
 libmpiext_example_mpifh_la_SOURCES = \
diff --git a/ompi/mpiext/example/mpif-h/mpiext_example_mpifh.h b/ompi/mpiext/example/mpif-h/example_mpifh.h
similarity index 100%
rename from ompi/mpiext/example/mpif-h/mpiext_example_mpifh.h
rename to ompi/mpiext/example/mpif-h/example_mpifh.h
diff --git a/ompi/mpiext/pcollreq/mpif-h/Makefile.am b/ompi/mpiext/pcollreq/mpif-h/Makefile.am
index e08b846df1..57f246bdfd 100644
--- a/ompi/mpiext/pcollreq/mpif-h/Makefile.am
+++ b/ompi/mpiext/pcollreq/mpif-h/Makefile.am
@@ -31,7 +31,7 @@ noinst_LTLIBRARIES =
 
 # Directory where the header file to be included in mpif-ext.h must be
 # installed.
-ompidir = $(ompiincludedir)/ompi/mpiext/pcollreq/mpif-h
+ompidir = $(ompiincludedir)/ompi/mpiext
 
 # Just like noinst_LTLIBRARIES, set this macro to empty and
 # conditionally add to it later.
@@ -46,7 +46,7 @@ if OMPI_BUILD_FORTRAN_MPIFH_BINDINGS
 noinst_LTLIBRARIES += libmpiext_pcollreq_mpifh.la
 
 # This is the header file that is installed.
-ompi_HEADERS += mpiext_pcollreq_mpifh.h
+ompi_HEADERS += pcollreq_mpifh.h
 
 noinst_HEADERS = mpiext_pcollreq_prototypes.h
 
diff --git a/ompi/mpiext/pcollreq/mpif-h/mpiext_pcollreq_mpifh.h b/ompi/mpiext/pcollreq/mpif-h/pcollreq_mpifh.h
similarity index 100%
rename from ompi/mpiext/pcollreq/mpif-h/mpiext_pcollreq_mpifh.h
rename to ompi/mpiext/pcollreq/mpif-h/pcollreq_mpifh.h