diff --git a/src/common/Makefile.am b/src/common/Makefile.am
index 5e1275abf..1ed848b50 100644
--- a/src/common/Makefile.am
+++ b/src/common/Makefile.am
@@ -28,7 +28,7 @@ liblumicommon_a_SOURCES =					\
 	$(liblumicommon_a_srcdir)/util.cpp			\
 	$(liblumicommon_a_srcdir)/visitor.cpp			\
 	$(liblumicommon_a_srcdir)/configrules.cpp		\
-	$(liblumicommon_a_srcdir)/error.cpp			\
+	$(liblumicommon_a_srcdir)/exception.cpp			\
 	$(liblumicommon_a_srcdir)/query.cpp			\
 	$(liblumicommon_a_srcdir)/query/mockconfigrules.cpp	\
 	$(liblumicommon_a_srcdir)/streamtype.cpp		\
diff --git a/src/gui/guinotificationfacade.cpp b/src/gui/guinotificationfacade.cpp
index 7822abe1b..30dd4da60 100644
--- a/src/gui/guinotificationfacade.cpp
+++ b/src/gui/guinotificationfacade.cpp
@@ -27,7 +27,7 @@
 #include "lib/util.hpp"
 
 extern "C" {
-#include "lumiera/interfacedescriptor.h"
+#include "lib/interfacedescriptor.h"
 }
 
 #include <string>
diff --git a/src/include/error.hpp b/src/include/error.hpp
index b1b94676c..bce21423c 100644
--- a/src/include/error.hpp
+++ b/src/include/error.hpp
@@ -152,7 +152,7 @@ namespace lumiera {
     
     
     /** install our own handler for undeclared exceptions. Will be
-     *  called automatically ON_BASIC_INIT when linking error.cpp */
+     *  called automatically ON_BASIC_INIT when linking exception.cpp */
     void install_unexpectedException_handler ();
     
   } // namespace error
diff --git a/src/lib/Makefile.am b/src/lib/Makefile.am
index b66d5c0d2..ac3a50d49 100644
--- a/src/lib/Makefile.am
+++ b/src/lib/Makefile.am
@@ -48,7 +48,7 @@ liblumiera_la_SOURCES =						\
 	$(liblumiera_la_srcdir)/util.cpp			\
 	$(liblumiera_la_srcdir)/visitor.cpp			\
 	$(liblumiera_la_srcdir)/configrules.cpp			\
-	$(liblumiera_la_srcdir)/error.cpp			\
+	$(liblumiera_la_srcdir)/exception.cpp			\
 	$(liblumiera_la_srcdir)/query.cpp			\
 	$(liblumiera_la_srcdir)/query/mockconfigrules.cpp	\
 	$(liblumiera_la_srcdir)/streamtype.cpp			\
diff --git a/src/lib/error.cpp b/src/lib/exception.cpp
similarity index 100%
rename from src/lib/error.cpp
rename to src/lib/exception.cpp