diff --git a/.travis.yml b/.travis.yml
index 24fd6e268e1..beb81d10968 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -40,15 +40,14 @@ env:
     - LDFLAGS='-L/usr/lib'
   
 script:
-  - ls -l /usr/include
   - autoreconf -i
   - export CFLAGS='-std=c99  -fsanitize=address -fno-omit-frame-pointer'
   - export FFLAGS='-fsanitize=address -fno-omit-frame-pointer'
   - export FCFLAGS='-fsanitize=address -fno-omit-frame-pointer'
   - export DISTCHECK_CONFIGURE_FLAGS='--enable-fortran'
   - ./configure --enable-fortran --enable-developer-docs
-  - make
   - make -j distcheck
+  - make -j distclean
   - rm -rf build
   - mkdir build
   - cd build
diff --git a/examples/c/Makefile.am b/examples/c/Makefile.am
index 8c037160110..920bde9fc52 100644
--- a/examples/c/Makefile.am
+++ b/examples/c/Makefile.am
@@ -4,7 +4,7 @@
 # Ed Hartnett 5/7/18
 
 # Link to our assembled library.
-LDADD = ${top_builddir}/src/clib/libpio.la
+LDADD = ${top_builddir}/src/clib/libpioc.la
 AM_CPPFLAGS = -I$(top_srcdir)/src/clib
 
 # Build the tests for make check.
diff --git a/src/clib/Makefile.am b/src/clib/Makefile.am
index f753409e210..b3d9050f882 100644
--- a/src/clib/Makefile.am
+++ b/src/clib/Makefile.am
@@ -2,18 +2,18 @@
 # Ed Hartnett 8/19/17
 
 # The library we are building.
-lib_LTLIBRARIES = libpio.la
+lib_LTLIBRARIES = libpioc.la
 
 # These linker flags specify libtool version info.
 # See http://www.gnu.org/software/libtool/manual/libtool.html#Libtool-versioning
 # for information regarding incrementing `-version-info`.
-libpio_la_LDFLAGS = -version-info 2:0:1
+libpioc_la_LDFLAGS = -version-info 2:0:1
 
 # The library header file will be installed in include dir.
 include_HEADERS = pio.h
 
 # The library soure files.
-libpio_la_SOURCES = bget.c pioc_sc.c pio_darray.c pio_file.c		\
+libpioc_la_SOURCES = bget.c pioc_sc.c pio_darray.c pio_file.c		\
 pio_getput_int.c pio_msg.c pio_nc.c pio_rearrange.c pioc.c		\
 pioc_support.c pio_darray_int.c pio_get_nc.c pio_lists.c pio_nc4.c	\
 pio_put_nc.c pio_spmd.c pio_get_vard.c pio_put_vard.c pio_internal.h	\
diff --git a/tests/cunit/Makefile.am b/tests/cunit/Makefile.am
index 2dd841917ec..f2b620223f0 100644
--- a/tests/cunit/Makefile.am
+++ b/tests/cunit/Makefile.am
@@ -4,9 +4,8 @@
 # Ed Hartnett 8/17/17
 
 # Link to our assembled library.
-#AM_LDFLAGS = ${top_builddir}/src/clib/libpio.la
 AM_CPPFLAGS = -I$(top_srcdir)/src/clib
-LDADD = ${top_builddir}/src/clib/libpio.la
+LDADD = ${top_builddir}/src/clib/libpioc.la
 
 # Build the tests for make check.
 check_PROGRAMS = test_intercomm2 test_async_mpi test_spmd		\
diff --git a/tests/cunit/test_async_mpi.c b/tests/cunit/test_async_mpi.c
index e4e615a6c58..79390326e70 100644
--- a/tests/cunit/test_async_mpi.c
+++ b/tests/cunit/test_async_mpi.c
@@ -430,8 +430,8 @@ int main(int argc, char **argv)
 		    int ioroot = 0;
 		    int msg = MSG_EXIT;
 		    
-                    if (verbose)
-                        printf("my_rank %d sending exit message on union_comm %d\n", my_rank, union_comm[cmp]);
+                    /* if (verbose) */
+                    /*     printf("my_rank %d sending exit message on union_comm %d\n", my_rank, union_comm[cmp]); */
                     if ((mpierr = MPI_Send(&msg, 1, MPI_INT, ioroot, 1, union_comm[cmp])))
                         MPIERR(mpierr);
                 }
diff --git a/tests/general/Makefile.am b/tests/general/Makefile.am
index d7f11687daa..68ece2cd2fd 100644
--- a/tests/general/Makefile.am
+++ b/tests/general/Makefile.am
@@ -11,7 +11,7 @@ include $(top_srcdir)/set_flags.am
 
 LDADD = libpio_tutil.la	\
 ${top_builddir}/src/flib/libpiof.la		\
-${top_builddir}/src/clib/libpio.la
+${top_builddir}/src/clib/libpioc.la
 
 # There is a test utility mod file in this subdir which must be built.
 SUBDIRS = util
diff --git a/tests/performance/Makefile.am b/tests/performance/Makefile.am
index 17a14e91ce8..751b970be92 100644
--- a/tests/performance/Makefile.am
+++ b/tests/performance/Makefile.am
@@ -14,7 +14,7 @@ LDADD = $(top_builddir)/src/gptl/libperf_mod.la	\
 $(top_builddir)/src/gptl/libperf_utils.la	\
 ${top_builddir}/tests/general/libpio_tutil.la	\
 ${top_builddir}/src/flib/libpiof.la		\
-${top_builddir}/src/clib/libpio.la
+${top_builddir}/src/clib/libpioc.la
 
 # Find perf_mod and perf_util.
 AM_CPPFLAGS += -I$(top_builddir)/src/gptl
diff --git a/tests/unit/Makefile.am b/tests/unit/Makefile.am
index 848f2af471b..879abb9b3b8 100644
--- a/tests/unit/Makefile.am
+++ b/tests/unit/Makefile.am
@@ -13,7 +13,7 @@ include $(top_srcdir)/set_flags.am
 check_PROGRAMS = pio_unit_test_driver
 pio_unit_test_driver_SOURCES = driver.F90
 pio_unit_test_driver_LDADD = libglobal_vars.la libncdf_tests.la	\
-libbasic_tests.la ${top_builddir}/src/flib/libpiof.la ${top_builddir}/src/clib/libpio.la
+libbasic_tests.la ${top_builddir}/src/flib/libpiof.la ${top_builddir}/src/clib/libpioc.la
 
 # Build these uninstalled convenience libraries.
 noinst_LTLIBRARIES = libglobal_vars.la libncdf_tests.la	\