diff --git a/Makefile.am b/Makefile.am
index 37216bba3e07798847a1cc05726acd0681beea24..94be4c4053d1f77498a76e4ed1f5b5a6068be78e 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -32,7 +32,7 @@ uninstall_code:
 # make a DEMO tar-ball and install it in pkgdatadir for later use
 #
 
-DEMO = @PACKAGE_NAME@-@PACKAGE_VERSION@-demo
+DEMO = @PACKAGE_NAME@-demo
 pkgdata_DATA = $(DEMO).tar.gz
 
 demo-tarball: $(DEMO).tar.gz
diff --git a/Makefile.am.template b/Makefile.am.template
index 7129eaa72f312dc616a16e805e8464fc158dc399..b3c3e5d6a1ab3dacfdd1f190489b28619835337c 100644
--- a/Makefile.am.template
+++ b/Makefile.am.template
@@ -6,14 +6,14 @@
 DIM_OF_WORLD = %DIM_OF_WORLD%
 ALBERTA_DEBUG = %ALBERTA_DEBUG%
 
-lib_LTLIBRARIES = libalberta%LIBCODE%.la
+lib_LTLIBRARIES = libalberta2%LIBCODE%.la
 
 include $(srcdir)/../Common/Makefile.am.include
 
 AM_CFLAGS = $(ALBERTA_%EFLAGS%_CFLAGS)
 
-nodist_libalberta%LIBCODE%_la_SOURCES = $(sources)
+nodist_libalberta2%LIBCODE%_la_SOURCES = $(sources)
 
 if HAVE_GLTOOLS
-nodist_libalberta%LIBCODE%_la_SOURCES += ../Common/gltools.c
+nodist_libalberta2%LIBCODE%_la_SOURCES += ../Common/gltools.c
 endif
diff --git a/generate-alberta-automakefiles.sh b/generate-alberta-automakefiles.sh
index 3a503edefb1600faa59576cd1122142bb472423a..00192b527adf960e0bccd27f4c9e4a6e3ff3055a 100755
--- a/generate-alberta-automakefiles.sh
+++ b/generate-alberta-automakefiles.sh
@@ -8,14 +8,14 @@
 for ALBERTA_DEBUG in 0 1; do
     for DIM_OF_WORLD in 1 2 3; do
 	if test $ALBERTA_DEBUG -eq 0; then
-	    LIBCODE=${DIM_OF_WORLD}
+	    LIBCODE=_${DIM_OF_WORLD}d
 	    EFLAGS=OPTIMIZE 
 	else
-	    LIBCODE=${DIM_OF_WORLD}_debug
+	    LIBCODE=_${DIM_OF_WORLD}d_debug
 	    EFLAGS=DEBUG 
 	fi
 
-        mkdir -p alberta/src/alberta$LIBCODE
-	sed -e "s/%DIM_OF_WORLD%/$DIM_OF_WORLD/g" Makefile.am.template -e "s/%DEBUG%/$DEBUG/g" -e "s/%ALBERTA_DEBUG%/$ALBERTA_DEBUG/g" -e "s/%LIBCODE%/$LIBCODE/g" -e "s/%EFLAGS%/$EFLAGS/g" > alberta/src/alberta$LIBCODE/Makefile.am
+        mkdir -p alberta/src/alberta2$LIBCODE
+	sed -e "s/%DIM_OF_WORLD%/$DIM_OF_WORLD/g" Makefile.am.template -e "s/%DEBUG%/$DEBUG/g" -e "s/%ALBERTA_DEBUG%/$ALBERTA_DEBUG/g" -e "s/%LIBCODE%/$LIBCODE/g" -e "s/%EFLAGS%/$EFLAGS/g" > alberta/src/alberta2$LIBCODE/Makefile.am
     done
 done
\ No newline at end of file
diff --git a/m4/alberta-check.m4 b/m4/alberta-check.m4
index c2a6bc0d1b7ba0f30b8cd513b591d01d8514f4d8..8a85524a5db73754cea13bbb768a10a9d22f289f 100644
--- a/m4/alberta-check.m4
+++ b/m4/alberta-check.m4
@@ -23,10 +23,10 @@ dnl
 AC_DEFUN([ALBERTA_CHECK_NEWLIBS],
 [
 if test "${ALBERTA_DEBUG}" = "1"; then
-	ALBERTA_LIB_$1=alberta$1_debug
+	ALBERTA_LIB_$1=alberta_$1d_debug
 	ALBERTA_LIB_$1_C=ac_cv_lib_ALBERTA$1_DEBUG
 else
-	ALBERTA_LIB_$1=alberta$1
+	ALBERTA_LIB_$1=alberta_$1d
 	ALBERTA_LIB_$1_C=ac_cv_lib_ALBERTA$1
 fi
 #
diff --git a/m4/alberta-dims.m4 b/m4/alberta-dims.m4
index a322d1c430a1df0ebc0951d90f16d743824aecec..f99f2e35f735f824138fcfbc45a9bed33c2d6396 100644
--- a/m4/alberta-dims.m4
+++ b/m4/alberta-dims.m4
@@ -9,9 +9,9 @@ AC_DEFUN([ALBERTA_DIMENSION_DISABLE],
 [ALBERTA_ENABLE_FLAG([alberta-$1],
 [disable building of an ALBERTA library for Finite Elements of dimension $1.], 1)
 dnl if test "$ALBERTA_$1$1" -eq 1; then
-	AC_CONFIG_FILES([alberta/src/alberta$1/Makefile])
+	AC_CONFIG_FILES([alberta/src/alberta2_$1d/Makefile])
 dnl	if test "$DEBUG" -eq 1; then
-		AC_CONFIG_FILES([alberta/src/alberta$1_debug/Makefile])
+		AC_CONFIG_FILES([alberta/src/alberta2_$1d_debug/Makefile])
 dnl	fi
 dnl fi
 ])
diff --git a/m4/grapeiface.m4 b/m4/grapeiface.m4
index 0276f0f185a01d958c29bec05b50d13f4d2bdc03..a80064ebb2a148cc65dcbfb5df870f28e9649c32 100644
--- a/m4/grapeiface.m4
+++ b/m4/grapeiface.m4
@@ -9,11 +9,11 @@ AM_CONDITIONAL(GRAPE, test -n "${GRAPE_LIB}")
 ALBERTA_LIB_PATH=$prefix/lib
 ALBERTA_INCLUDE_PATH='$(top_srcdir)/alberta/src/Common/ -I$(top_srcdir)/alberta_util/src/  -I$(top_builddir)/alberta_util/src/'
 
-ALBERTA_LIBS_1='$(top_builddir)/alberta/src/alberta1/libalberta1.la $(top_builddir)/alberta_util/src/libalberta2_util.la $(BLAS_ALL_LIB) $(GLTOOLS_ALL_LIB)'
+ALBERTA_LIBS_1='$(top_builddir)/alberta/src/alberta2_1d/libalberta2_1d.la $(top_builddir)/alberta_util/src/libalberta2_util.la $(BLAS_ALL_LIB) $(GLTOOLS_ALL_LIB)'
 
-ALBERTA_LIBS_2='$(top_builddir)/alberta/src/alberta2/libalberta2.la $(top_builddir)/alberta_util/src/libalberta2_util.la $(BLAS_ALL_LIB) $(GLTOOLS_ALL_LIB)'
+ALBERTA_LIBS_2='$(top_builddir)/alberta/src/alberta2_2d/libalberta2_2d.la $(top_builddir)/alberta_util/src/libalberta2_util.la $(BLAS_ALL_LIB) $(GLTOOLS_ALL_LIB)'
 
-ALBERTA_LIBS_3='$(top_builddir)/alberta/src/alberta3/libalberta3.la $(top_builddir)/alberta_util/src/libalberta2_util.la $(BLAS_ALL_LIB) $(GLTOOLS_ALL_LIB)'
+ALBERTA_LIBS_3='$(top_builddir)/alberta/src/alberta2_3d/libalberta2_3d.la $(top_builddir)/alberta_util/src/libalberta2_util.la $(BLAS_ALL_LIB) $(GLTOOLS_ALL_LIB)'
 ALBERTA_DEBUG=
 AC_SUBST(ALBERTA_DEBUG)
 AC_SUBST(ALBERTA_LIB_PATH)