diff --git a/Makefile b/Makefile
index 4e18b10b..76066b4d 100644
--- a/Makefile
+++ b/Makefile
@@ -92,7 +92,7 @@ clean:
 	cd $(ROOTDIR)/test-suite && ./clean_tests
 
 veryclean: clean
-	cd $(ROOTDIR) && rm -f wannier90.x postw90.x w90chk2chk.x w90spn2spn.x libwannier90_{mpi,serial}.{a,so.4}
+	cd $(ROOTDIR) && rm -f wannier90.x postw90.x w90chk2chk.x w90spn2spn.x libwannier90.{a,so.4} libwannier90_mpi.{a,so.4}
 	cd $(ROOTDIR)/test-suite && ./clean_tests -i
 
 thedoc:
diff --git a/src/Makefile.header b/src/Makefile.header
index 5e030b8c..d33deacb 100644
--- a/src/Makefile.header
+++ b/src/Makefile.header
@@ -32,11 +32,11 @@ SHAREDLIBFLAGS ?=-shared -Wl,-soname,libwannier90.so.4 -fPIC
 
 ## Define the filename
 ifdef USEMPI
-  LIBSUFFIX=mpi
+  LIBSUFFIX=_mpi
 else
-  LIBSUFFIX=serial
+  LIBSUFFIX=
 endif
 
-DYNLIBBASE = wannier90_$(LIBSUFFIX)
-LIBRARYV2 =       ../../libwannier90_$(LIBSUFFIX).a
-DYNLIBRARY =            libwannier90_$(LIBSUFFIX).so.4
+DYNLIBBASE = wannier90$(LIBSUFFIX)
+LIBRARYV2 =  ../../libwannier90$(LIBSUFFIX).a
+DYNLIBRARY =       libwannier90$(LIBSUFFIX).so.4
diff --git a/test-suite/libv2-demo2/makefile b/test-suite/libv2-demo2/makefile
index c0f44be5..8afce270 100644
--- a/test-suite/libv2-demo2/makefile
+++ b/test-suite/libv2-demo2/makefile
@@ -1,7 +1,7 @@
 include ../../make.inc
 .cc.o:
-	$(CXX) -g -I ../../src -c $<  -fpermissive
-wannier_c.x : wannier.o ../../libwan2.a
-	$(CXX) -g  wannier.o ../../libwan2.a $(LIBS) -lgfortran -o $@ -fpermissive
+	$(CXX) $(FCOPTS) -g -I ../../src -c $<  -fpermissive
+wannier_c.x : wannier.o ../../libwannier90.a
+	$(CXX) $(LDOPTS) -g wannier.o ../../libwannier90.a $(LIBS) -lgfortran -o $@ -fpermissive
 clean:
 	@rm wannier.o wannier_c.x