diff --git a/src/lumiera/Makefile.am b/src/lumiera/Makefile.am
index 44b126e3e..deaa5a84c 100644
--- a/src/lumiera/Makefile.am
+++ b/src/lumiera/Makefile.am
@@ -18,45 +18,29 @@
 lumiera_srcdir = $(top_srcdir)/src/lumiera
 
 
-noinst_LIBRARIES += liblumieraconfig.a
-liblumieraconfig_a_CPPFLAGS = $(AM_CPPFLAGS)
-liblumieraconfig_a_CFLAGS = $(AM_CFLAGS) -std=gnu99 -Wextra -Wall -Werror
+noinst_LIBRARIES += liblumieracore.a
+liblumieracore_a_CPPFLAGS = $(AM_CPPFLAGS) -DLUMIERA_PLUGIN_PATH="\"$(pkglibdir)\""
+liblumieracore_a_CFLAGS = $(AM_CFLAGS) -std=gnu99 -Wextra -Wall -Werror
 
-liblumieraconfig_a_SOURCES =			\
+liblumieracore_a_SOURCES =			\
 	$(lumiera_srcdir)/config.c		\
 	$(lumiera_srcdir)/config_typed.c	\
 	$(lumiera_srcdir)/config_wordlist.c	\
 	$(lumiera_srcdir)/configentry.c		\
 	$(lumiera_srcdir)/configitem.c		\
 	$(lumiera_srcdir)/config_lookup.c	\
-	$(lumiera_srcdir)/config_interface.c
-
-
-
-noinst_LIBRARIES += liblumieraplugin.a
-liblumieraplugin_a_CPPFLAGS = $(AM_CPPFLAGS) -DLUMIERA_PLUGIN_PATH="\"$(pkglibdir)\""
-liblumieraplugin_a_CFLAGS = $(AM_CFLAGS) -std=gnu99 -Wextra -Wall -Werror
-
-liblumieraplugin_a_SOURCES =			\
+	$(lumiera_srcdir)/config_interface.c	\
 	$(lumiera_srcdir)/interface.c		\
 	$(lumiera_srcdir)/interfaceregistry.c	\
 	$(lumiera_srcdir)/plugin.c		\
-	$(lumiera_srcdir)/plugin_dynlib.c
-
-
-
-noinst_LIBRARIES += liblumierainit.a
-liblumierainit_a_CPPFLAGS = $(AM_CPPFLAGS)
-liblumierainit_a_CFLAGS = $(AM_CFLAGS) -std=gnu99 -Wextra -Wall -Werror
-
-liblumierainit_a_SOURCES =			\
+	$(lumiera_srcdir)/plugin_dynlib.c	\
 	$(lumiera_srcdir)/lumiera_init.c
 
 
 bin_PROGRAMS += lumiera
 lumiera_CPPFLAGS = $(AM_CPPFLAGS) -DLUMIERA_CONFIG_PATH="\"$(pkgdatadir)/config\""
 lumiera_CFLAGS = $(AM_CFLAGS) -std=gnu99 -Wextra -Wall -Werror
-lumiera_LDADD = liblumieraplugin.a liblumieraconfig.a liblumierainit.a liblumiera.a $(LUMIERA_PLUGIN_LIBS) $(NOBUGMT_LUMIERA_LIBS)
+lumiera_LDADD = liblumieracore.a liblumiera.a $(LUMIERA_PLUGIN_LIBS) $(NOBUGMT_LUMIERA_LIBS)
 
 lumiera_SOURCES =				\
 	$(lumiera_srcdir)/lumiera.c
diff --git a/tests/Makefile.am b/tests/Makefile.am
index 6ab82f8b1..22b4b36f7 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -64,7 +64,7 @@ test_filehandles_LDADD = liblumibackend.a liblumiera.a $(NOBUGMT_LUMIERA_LIBS)
 check_PROGRAMS += test-config
 test_config_SOURCES = $(tests_srcdir)/lumiera/test-config.c
 test_config_CPPFLAGS = $(AM_CPPFLAGS) -std=gnu99 -Wall -Werror -I$(top_srcdir)/src/
-test_config_LDADD = liblumieraconfig.a liblumierainit.a liblumiera.a $(NOBUGMT_LUMIERA_LIBS)
+test_config_LDADD = liblumieracore.a liblumiera.a $(LUMIERA_PLUGIN_LIBS) $(NOBUGMT_LUMIERA_LIBS)
 
 check_LTLIBRARIES += examplepluginc.la
 examplepluginc_la_SOURCES = $(tests_srcdir)/lumiera/example_plugin.c
@@ -74,8 +74,8 @@ examplepluginc_la_LDFLAGS = -module -avoid-version -no-undefined -rpath /dev/nul
 check_PROGRAMS += test-interfaces
 test_interfaces_SOURCES = $(tests_srcdir)/lumiera/test-interfaces.c
 test_interfaces_CPPFLAGS = $(AM_CPPFLAGS) -std=gnu99 -Wall -Werror
-test_interfaces_LDADD =  liblumieraplugin.a liblumieraconfig.a liblumierainit.a liblumiera.a $(LUMIERA_PLUGIN_LIBS) $(NOBUGMT_LUMIERA_LIBS)
-test_interfaces_DEPENDENCIES = examplepluginc.la liblumierainit.a liblumieraconfig.a liblumieraplugin.a liblumiera.a
+test_interfaces_LDADD =  liblumieracore.a liblumiera.a $(LUMIERA_PLUGIN_LIBS) $(NOBUGMT_LUMIERA_LIBS)
+test_interfaces_DEPENDENCIES = examplepluginc.la liblumieracore.a liblumiera.a
 
 check_PROGRAMS += test-filemmap
 test_filemmap_SOURCES = $(tests_srcdir)/backend/test-filemmap.c