diff --git a/ompi/mca/io/romio314/Makefile.am b/ompi/mca/io/romio314/Makefile.am
index d3067c0e53..8b237db7ba 100644
--- a/ompi/mca/io/romio314/Makefile.am
+++ b/ompi/mca/io/romio314/Makefile.am
@@ -32,7 +32,7 @@ endif
 # mca_<type>_<name>.la (for DSO builds) or libmca_<type>_<name>.la
 # (for static builds).
 
-if MCA_BUILD_ompi_io_romio_DSO
+if MCA_BUILD_ompi_io_romio314_DSO
 lib =
 lib_sources =
 component = mca_io_romio.la
diff --git a/ompi/mca/io/romio314/configure.m4 b/ompi/mca/io/romio314/configure.m4
index 1506addf52..8c97dcf9ca 100644
--- a/ompi/mca/io/romio314/configure.m4
+++ b/ompi/mca/io/romio314/configure.m4
@@ -20,15 +20,15 @@
 # $HEADER$
 #
 
-AC_DEFUN([MCA_ompi_io_romio_POST_CONFIG], [
+AC_DEFUN([MCA_ompi_io_romio314_POST_CONFIG], [
     AM_CONDITIONAL([MCA_io_romio_SHOULD_BUILD], [test $1 -eq 1])
 ])
 
 
 # MCA_io_romio_CONFIG([action-if-found], [action-if-not-found])
 # -----------------------------------------------------------
-AC_DEFUN([MCA_ompi_io_romio_CONFIG],[
-    AC_CONFIG_FILES([ompi/mca/io/romio/Makefile])
+AC_DEFUN([MCA_ompi_io_romio314_CONFIG],[
+    AC_CONFIG_FILES([ompi/mca/io/romio314/Makefile])
 
     OPAL_VAR_SCOPE_PUSH([io_romio_flags io_romio_flags_define io_romio_happy io_romio_save_LIBS])
     AC_ARG_ENABLE([io-romio],
@@ -83,7 +83,7 @@ AC_DEFUN([MCA_ompi_io_romio_CONFIG],[
                    io_romio_flags="$io_romio_flags FROM_OMPI=yes CC="'"'"$CC"'"'" CFLAGS="'"'"$CFLAGS -D__EXTENSIONS__"'"'" CPPFLAGS="'"'"$CPPFLAGS"'"'" FFLAGS="'"'"$FFLAGS"'"'" LDFLAGS="'"'"$LDFLAGS"'"'" --$io_romio_shared-shared --$io_romio_static-static $io_romio_flags $io_romio_prefix_arg --disable-aio --disable-weak-symbols --enable-strict"
 
                    opal_show_subtitle "Configuring ROMIO distribution"
-                   OPAL_CONFIG_SUBDIR([ompi/mca/io/romio/romio],
+                   OPAL_CONFIG_SUBDIR([ompi/mca/io/romio314/romio],
                                       [$io_romio_flags],
                                       [io_romio_happy=1], [io_romio_happy=0])
 
@@ -94,7 +94,7 @@ AC_DEFUN([MCA_ompi_io_romio_CONFIG],[
                            # the wrapper settings
                           io_romio_save_LIBS="$LIBS"
                           LIBS=
-                          . ompi/mca/io/romio/romio/localdefs
+                          . ompi/mca/io/romio314/romio/localdefs
                           io_romio_LIBS="$LIBS"
                           LIBS="$io_romio_save_LIBS"
 
diff --git a/ompi/mca/io/romio314/src/Makefile.extra b/ompi/mca/io/romio314/src/Makefile.extra
index acc03b4f57..1ddfcc3fa8 100644
--- a/ompi/mca/io/romio314/src/Makefile.extra
+++ b/ompi/mca/io/romio314/src/Makefile.extra
@@ -31,9 +31,9 @@ AM_CPPFLAGS = \
         -I$(OMPI_TOP_BUILDDIR)/ompi/include \
         -I$(OMPI_TOP_SRCDIR)/ompi \
         -I$(OMPI_TOP_SRCDIR)/ompi/include \
-        -I$(OMPI_TOP_SRCDIR)/ompi/mca/io/romio \
-        -I$(OMPI_TOP_SRCDIR)/ompi/mca/io/romio/romio/include \
-        -I$(OMPI_TOP_SRCDIR)/ompi/mca/io/romio/romio/adio/include \
+        -I$(OMPI_TOP_SRCDIR)/ompi/mca/io/romio314 \
+        -I$(OMPI_TOP_SRCDIR)/ompi/mca/io/romio314/romio/include \
+        -I$(OMPI_TOP_SRCDIR)/ompi/mca/io/romio314/romio/adio/include \
         -I$(top_builddir)
 
 sources += \