diff --git a/MAC/APL/PAC/LBA_Calibration/MatlabCal.spec.in b/MAC/APL/PAC/LBA_Calibration/LBA_Calibration.spec.in
similarity index 95%
rename from MAC/APL/PAC/LBA_Calibration/MatlabCal.spec.in
rename to MAC/APL/PAC/LBA_Calibration/LBA_Calibration.spec.in
index 0380618a26ef522803e5086d8e0e19cb8830197a..f86a60480b10cad220bb94f21a58e5cec5522358 100644
--- a/MAC/APL/PAC/LBA_Calibration/MatlabCal.spec.in
+++ b/MAC/APL/PAC/LBA_Calibration/LBA_Calibration.spec.in
@@ -1,5 +1,5 @@
 # -*- Mode:rpm-spec -*-
-# MatlabCal.spec.in
+# LBA_Calibration.spec.in
 #
 
 ##############################################################################
@@ -8,7 +8,7 @@
 #
 ##############################################################################
 
-Summary: The MatlabCal library creates a C-library from matlab code.
+Summary: The LBA_Calibration library creates a C-library from matlab code.
 
 %define release @RPM_RELEASE@
 %define version @VERSION@
@@ -37,7 +37,7 @@ AutoReqProv: no
 
 %description
 
-The MatlabCal library implements LBA station calibration by compiling Matlab
+The LBA_Calibration library implements LBA station calibration by compiling Matlab
 code with the MatLab compiler into a C-lib that can be used by the CalServer.
 
 ##############################################################################
diff --git a/MAC/APL/PAC/LBA_Calibration/configure.in b/MAC/APL/PAC/LBA_Calibration/configure.in
index 6341655a9adf9914c9a9014b5f9462fc93d66d2a..1ff0feecb82053ab49063425e5a6c89ca9abd4b8 100644
--- a/MAC/APL/PAC/LBA_Calibration/configure.in
+++ b/MAC/APL/PAC/LBA_Calibration/configure.in
@@ -5,7 +5,7 @@ AC_INIT
 dnl AC_CONFIG_AUX_DIR(config)
 dnl AM_CONFIG_HEADER(config/config.h)
 AM_CONFIG_HEADER(config.h)
-AM_INIT_AUTOMAKE(MatlabCal, 1.0, no-define)
+AM_INIT_AUTOMAKE(LBA_Calibration, 1.0, no-define)
 
 dnl Initialize for LOFAR (may set compilers)
 lofar_INIT
@@ -59,9 +59,9 @@ dnl
 dnl Output Makefiles
 dnl
 AC_OUTPUT(
-include/APL/MatlabCal/Makefile
+include/APL/LBA_Calibration/Makefile
 src/Makefile
 test/Makefile
 Makefile
-MatlabCal.spec
+LBA_Calibration.spec
 )
diff --git a/MAC/APL/PAC/LBA_Calibration/include/APL/MatlabCal/Makefile.am b/MAC/APL/PAC/LBA_Calibration/include/APL/LBA_Calibration/Makefile.am
similarity index 79%
rename from MAC/APL/PAC/LBA_Calibration/include/APL/MatlabCal/Makefile.am
rename to MAC/APL/PAC/LBA_Calibration/include/APL/LBA_Calibration/Makefile.am
index 99467abb1885c73e16e1b3f7a250d72b6d7731b0..7c9f00a80071b0cd8aff9487e63dec3b9499a341 100644
--- a/MAC/APL/PAC/LBA_Calibration/include/APL/MatlabCal/Makefile.am
+++ b/MAC/APL/PAC/LBA_Calibration/include/APL/LBA_Calibration/Makefile.am
@@ -1,7 +1,7 @@
 INSTHDRS			= 
 NOINSTHDRS			= 
 TCCHDRS				= 
-pkgincludedir		= $(includedir)/APL/MatlabCal
+pkgincludedir		= $(includedir)/APL/LBA_Calibration
 pkginclude_HEADERS	= $(INSTHDRS) $(TCCHDRS)
 noinst_HEADERS		= $(NOINSTHDRS)
 DOCHDRS				= $(INSTHDRS) $(NOINSTHDRS)
diff --git a/MAC/APL/PAC/LBA_Calibration/package.dox b/MAC/APL/PAC/LBA_Calibration/package.dox
index a44bb3fa0e5714ce8631ec9e86803d0367533b04..383b6b69733c9aa9dee5a1e29c6cbc63362a9d95 100644
--- a/MAC/APL/PAC/LBA_Calibration/package.dox
+++ b/MAC/APL/PAC/LBA_Calibration/package.dox
@@ -1,2 +1,2 @@
 // \ingroup PAC
-// \defgroup MatlabCal Compilation of Matlab calibration routines.
+// \defgroup LBA_Calibration Compilation of Matlab calibration routines.
diff --git a/MAC/APL/PAC/LBA_Calibration/src/Makefile.am b/MAC/APL/PAC/LBA_Calibration/src/Makefile.am
index 74d4090851318dc19bdebf1ba5ab3d7b6adba2f7..a1d8967eb9523c6140b0d04cb0e38b41fb4fe09a 100644
--- a/MAC/APL/PAC/LBA_Calibration/src/Makefile.am
+++ b/MAC/APL/PAC/LBA_Calibration/src/Makefile.am
@@ -22,7 +22,7 @@ BUILT_SOURCES	= liblba_calibration.so
 #libcalibrate_la_SOURCES = calibrate.m 
 
 
-pkgincludedir = $(includedir)/APL/MatlabCal
+pkgincludedir = $(includedir)/APL/LBA_Calibration
 #pkginclude_HEADERS = $(BUILT_SOURCES)
 
 include $(top_srcdir)/Makefile.common
diff --git a/MAC/APL/PAC/LBA_Calibration/test/Makefile.am b/MAC/APL/PAC/LBA_Calibration/test/Makefile.am
index 858c15c63602021efc085156c87bec4fe7617362..e9a663520d8ac13b804b692d145ca9e69d9f1cb2 100644
--- a/MAC/APL/PAC/LBA_Calibration/test/Makefile.am
+++ b/MAC/APL/PAC/LBA_Calibration/test/Makefile.am
@@ -8,7 +8,7 @@ sbin_PROGRAMS = \
 	tCalibrate
 
 tCalibrate_SOURCES 	= $(BUILT_SOURCES) tCalibrate.cc
-tCalibrate_LDADD	= -llba_calibration $(LOFAR_DEPEND)
+tCalibrate_LDADD	= -llba_calibration -L../src/ $(LOFAR_DEPEND)
 tCalibrate_DEPENDENCIES	= $(LOFAR_DEPEND)
 
 BUILT_SOURCES = 
diff --git a/MAC/APL/PAC/LBA_Calibration/test/tCalibrate.cc b/MAC/APL/PAC/LBA_Calibration/test/tCalibrate.cc
index 6479b364cffcdff77880c5acba006920224f1038..2be799ef998ea8e78da3635197ad7135f650da8a 100644
--- a/MAC/APL/PAC/LBA_Calibration/test/tCalibrate.cc
+++ b/MAC/APL/PAC/LBA_Calibration/test/tCalibrate.cc
@@ -1,4 +1,4 @@
-#include <APL/MatlabCal/lba_calibration.h>
+#include <APL/LBA_Calibration/lba_calibration.h>
 #include <iostream>
 #include <fstream>
 #include <iterator>