diff --git a/src/gui/Makefile.am b/src/gui/Makefile.am
index 79e402310..16e907e44 100644
--- a/src/gui/Makefile.am
+++ b/src/gui/Makefile.am
@@ -82,7 +82,7 @@ lumigui_LDADD = $(GTK_LUMIERA_LIBS) liblumicommon.a liblumi.a $(NOBUGMT_LUMIERA_
 lumigui_DEPENDENCIES =											\
 	$(top_builddir)/lumiera_ui.rc								\
 	$(top_builddir)/liblumicommon.a								\
-	$(top_builddir)/liblumi.a
+	$(top_builddir)/liblumiera.a
 	 
 $(top_builddir)/lumiera_ui.rc:
 	cp $(lumigui_srcdir)/lumiera_ui.rc $(top_builddir)
diff --git a/tests/Makefile.am b/tests/Makefile.am
index 0c7f80f12..10cdeed10 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -21,51 +21,51 @@ tests_srcdir = $(top_srcdir)/tests
 check_PROGRAMS += test-error
 test_error_SOURCES = $(tests_srcdir)/error/errortest.c
 test_error_CPPFLAGS = $(AM_CPPFLAGS) -std=gnu99 -Wall -Werror
-test_error_LDADD = liblumi.a $(NOBUGMT_LUMIERA_LIBS) -ldl
+test_error_LDADD = liblumiera.a $(NOBUGMT_LUMIERA_LIBS) -ldl
 
 check_PROGRAMS += test-locking
 test_locking_SOURCES = $(tests_srcdir)/library/test-locking.c
 test_locking_CPPFLAGS = $(AM_CPPFLAGS) -std=gnu99 -Wall -Werror
-test_locking_LDADD = liblumi.a $(NOBUGMT_LUMIERA_LIBS) -ldl -lm
+test_locking_LDADD = liblumiera.a $(NOBUGMT_LUMIERA_LIBS) -ldl -lm
 
 check_PROGRAMS += test-llist
 test_llist_SOURCES = $(tests_srcdir)/library/test-llist.c
 test_llist_CPPFLAGS = $(AM_CPPFLAGS) -std=gnu99 -Wall -Werror
-test_llist_LDADD = liblumi.a $(NOBUGMT_LUMIERA_LIBS) -ldl -lm
+test_llist_LDADD = liblumiera.a $(NOBUGMT_LUMIERA_LIBS) -ldl -lm
 
 check_PROGRAMS += test-psplay
 test_psplay_SOURCES = $(tests_srcdir)/library/test-psplay.c
 test_psplay_CPPFLAGS = $(AM_CPPFLAGS) -std=gnu99 -Wall -Werror -I$(top_srcdir)/src/
-test_psplay_LDADD = liblumi.a $(NOBUGMT_LUMIERA_LIBS) -ldl -lm
+test_psplay_LDADD = liblumiera.a $(NOBUGMT_LUMIERA_LIBS) -ldl -lm
 
 check_PROGRAMS += test-safeclib
 test_safeclib_SOURCES = $(tests_srcdir)/library/test-safeclib.c
 test_safeclib_CPPFLAGS = $(AM_CPPFLAGS) -std=gnu99 -Wall -Werror
-test_safeclib_LDADD = liblumi.a $(NOBUGMT_LUMIERA_LIBS) -ldl -lm
+test_safeclib_LDADD = liblumiera.a $(NOBUGMT_LUMIERA_LIBS) -ldl -lm
 
 check_PROGRAMS += test-luid
 test_luid_SOURCES = $(tests_srcdir)/library/test-luid.c
 test_luid_CPPFLAGS = $(AM_CPPFLAGS) -std=gnu99 -Wall -Werror
-test_luid_LDADD = liblumi.a $(NOBUGMT_LUMIERA_LIBS) -ldl -lm
+test_luid_LDADD = liblumiera.a $(NOBUGMT_LUMIERA_LIBS) -ldl -lm
 
 check_PROGRAMS += test-interfaces
 test_interfaces_SOURCES = $(tests_srcdir)/backend/test-interfaces.c
 test_interfaces_CPPFLAGS = $(AM_CPPFLAGS) -std=gnu99 -Wall -Werror
-test_interfaces_LDADD = liblumibackend.a liblumi.a $(NOBUGMT_LUMIERA_LIBS) -ldl -lm
+test_interfaces_LDADD = liblumibackend.a liblumiera.a $(NOBUGMT_LUMIERA_LIBS) -ldl -lm
 
 check_PROGRAMS += test-filedescriptors
 test_filedescriptors_SOURCES = $(tests_srcdir)/backend/test-filedescriptors.c
 test_filedescriptors_CPPFLAGS = $(AM_CPPFLAGS) -std=gnu99 -Wall -Werror
-test_filedescriptors_LDADD = liblumibackend.a liblumi.a $(NOBUGMT_LUMIERA_LIBS) -ldl -lm
+test_filedescriptors_LDADD = liblumibackend.a liblumiera.a $(NOBUGMT_LUMIERA_LIBS) -ldl -lm
 
 check_PROGRAMS += test-filehandles
 test_filehandles_SOURCES = $(tests_srcdir)/backend/test-filehandles.c
 test_filehandles_CPPFLAGS = $(AM_CPPFLAGS) -std=gnu99 -Wall -Werror
-test_filehandles_LDADD = liblumibackend.a liblumi.a $(NOBUGMT_LUMIERA_LIBS) -ldl -lm
+test_filehandles_LDADD = liblumibackend.a liblumiera.a $(NOBUGMT_LUMIERA_LIBS) -ldl -lm
 
 check_PROGRAMS += test-config
 test_config_SOURCES = $(tests_srcdir)/backend/test-config.c
 test_config_CPPFLAGS = $(AM_CPPFLAGS) -std=gnu99 -Wall -Werror -I$(top_srcdir)/src/
-test_config_LDADD = liblumibackend.a liblumi.a $(NOBUGMT_LUMIERA_LIBS) -ldl -lm
+test_config_LDADD = liblumibackend.a liblumiera.a $(NOBUGMT_LUMIERA_LIBS) -ldl -lm
 
 TESTS = $(tests_srcdir)/test.sh
diff --git a/tests/common/Makefile.am b/tests/common/Makefile.am
index f10134e33..8582b26f2 100644
--- a/tests/common/Makefile.am
+++ b/tests/common/Makefile.am
@@ -27,7 +27,7 @@ test_common_LDADD =								\
 	liblumiprocmobjectsession.a						\
 	liblumiprocasset.a							\
 	liblumiprocmobject.a							\
-	liblumi.a								\
+	liblumiera.a								\
 	liblumicommon.a								\
 	liblumibackend.a							\
 	$(NOBUGMT_LUMIERA_LIBS) -ldl -lboost_program_options-mt -lboost_regex-mt
diff --git a/tests/components/Makefile.am b/tests/components/Makefile.am
index 657b51f85..43503640a 100644
--- a/tests/components/Makefile.am
+++ b/tests/components/Makefile.am
@@ -27,7 +27,7 @@ test_components_LDADD =								\
 	liblumiprocmobjectsession.a						\
 	liblumiprocasset.a							\
 	liblumiprocmobject.a							\
-	liblumi.a								\
+	liblumiera.a								\
 	liblumicommon.a								\
 	liblumibackend.a							\
 	$(NOBUGMT_LUMIERA_LIBS) -ldl -lboost_program_options-mt -lboost_regex-mt