diff --git a/orca/Makefile.am b/orca/Makefile.am
index 12800d975a..97ec5d3560 100644
--- a/orca/Makefile.am
+++ b/orca/Makefile.am
@@ -33,21 +33,21 @@ DIST_SUBDIRS = \
 # Build the main ORCA library
 
 lib_LTLIBRARIES = libopen-rca.la
-libopen-rca_la_SOURCES =
-libopen-rca_la_LIBADD = \
+libopen_rca_la_SOURCES =
+libopen_rca_la_LIBADD = \
 	$(MCA_orca_FRAMEWORK_LIBS) \
 	$(top_ompi_builddir)/opal/libopen-pal-lt.la
 #	$(top_ompi_builddir)/orte/libopen-rte-lt.la
 
 
-libopen-rca_la_DEPENDENCIES = $(libopen-rca_la_LIBADD)
-libopen-rca_la_LDFLAGS = -version-info $(libopen-rca_so_version)
+libopen_rca_la_DEPENDENCIES = $(libopen_rca_la_LIBADD)
+libopen_rca_la_LDFLAGS = -version-info $(libopen_rca_so_version)
 
 # included subdirectory Makefile.am's and appended-to variables
 headers =
 noinst_LTLIBRARIES =
 dist_pkgdata_DATA =
-libopen-rca_la_SOURCES += $(headers)
+libopen_rca_la_SOURCES += $(headers)
 
 # Conditionally install the header files
 
@@ -72,6 +72,6 @@ include util/Makefile.am
 if PROJECT_ORCA
 noinst_LTLIBRARIES += libopen-rca-lt.la
 endif
-libopen-rca_lt_la_SOURCES = $(libopen-rca_la_SOURCES)
-libopen-rca_lt_la_LIBADD = $(libopen-rca_la_LIBADD)
-libopen-rca_lt_la_DEPENDENCIES = $(libopen-rca_la_DEPENDENCIES)
+libopen_rca_lt_la_SOURCES = $(libopen_rca_la_SOURCES)
+libopen_rca_lt_la_LIBADD = $(libopen_rca_la_LIBADD)
+libopen_rca_lt_la_DEPENDENCIES = $(libopen_rca_la_DEPENDENCIES)
diff --git a/orca/runtime/Makefile.am b/orca/runtime/Makefile.am
index b83bebb89e..1796626d4a 100644
--- a/orca/runtime/Makefile.am
+++ b/orca/runtime/Makefile.am
@@ -16,7 +16,7 @@ headers += \
 		runtime/runtime.h \
 		runtime/orca_dt.h
 
-libopen-rca_la_SOURCES += \
+libopen_rca_la_SOURCES += \
         runtime/orca_init.c \
         runtime/orca_params.c \
         runtime/orca_finalize.c \
diff --git a/orca/util/Makefile.am b/orca/util/Makefile.am
index e1adc4a3d7..ab30048c09 100644
--- a/orca/util/Makefile.am
+++ b/orca/util/Makefile.am
@@ -12,5 +12,5 @@
 headers += \
 	util/error_strings.h
 
-libopen-rca_la_SOURCES += \
+libopen_rca_la_SOURCES += \
 	util/error_strings.c