diff --git a/Makefile.am.template b/Makefile.am.template
index 55b3aeb842904cb982cc0c83b9b2095d06dbe5e7..d3a9bc6dc4ced65c60b13afd3d549a2597ce488f 100644
--- a/Makefile.am.template
+++ b/Makefile.am.template
@@ -36,43 +36,43 @@ libalberta%LIBCODE%_la_LDFLAGS = -version-info 4:0:0
 libSS_assemble%LIBCODE%_la_SOURCES = $(assemble_sources)
 libSS_assemble%LIBCODE%_la_CPPFLAGS = \
  $(libalberta%LIBCODE%_la_CPPFLAGS)\
- -DHAVE_PSI_V_TYPE=0 -DHAVE_PHI_V_TYPE=0\
- -DHAVE_PSI_C_TYPE=0 -DHAVE_PHI_C_TYPE=0
+ -DHAVE_ROW_FCTS_V_TYPE=0 -DHAVE_COL_FCTS_V_TYPE=0\
+ -DHAVE_ROW_FCTS_C_TYPE=0 -DHAVE_COL_FCTS_C_TYPE=0
 
 # vector-vector
 libVV_assemble%LIBCODE%_la_SOURCES = $(assemble_sources)
 libVV_assemble%LIBCODE%_la_CPPFLAGS = \
  $(libalberta%LIBCODE%_la_CPPFLAGS)\
- -DHAVE_PSI_V_TYPE=1 -DHAVE_PHI_V_TYPE=1\
- -DHAVE_PSI_C_TYPE=0 -DHAVE_PHI_C_TYPE=0
+ -DHAVE_ROW_FCTS_V_TYPE=1 -DHAVE_COL_FCTS_V_TYPE=1\
+ -DHAVE_ROW_FCTS_C_TYPE=0 -DHAVE_COL_FCTS_C_TYPE=0
 
 # vector-Cartesian
 libVC_assemble%LIBCODE%_la_SOURCES = $(assemble_sources)
 libVC_assemble%LIBCODE%_la_CPPFLAGS = \
  $(libalberta%LIBCODE%_la_CPPFLAGS)\
- -DHAVE_PSI_V_TYPE=1 -DHAVE_PHI_V_TYPE=0\
- -DHAVE_PSI_C_TYPE=0 -DHAVE_PHI_C_TYPE=1
+ -DHAVE_ROW_FCTS_V_TYPE=1 -DHAVE_COL_FCTS_V_TYPE=0\
+ -DHAVE_ROW_FCTS_C_TYPE=0 -DHAVE_COL_FCTS_C_TYPE=1
 
 # Cartesian-vector
 libCV_assemble%LIBCODE%_la_SOURCES = $(assemble_sources)
 libCV_assemble%LIBCODE%_la_CPPFLAGS = \
  $(libalberta%LIBCODE%_la_CPPFLAGS)\
- -DHAVE_PSI_V_TYPE=0 -DHAVE_PHI_V_TYPE=1\
- -DHAVE_PSI_C_TYPE=1 -DHAVE_PHI_C_TYPE=0
+ -DHAVE_ROW_FCTS_V_TYPE=0 -DHAVE_COL_FCTS_V_TYPE=1\
+ -DHAVE_ROW_FCTS_C_TYPE=1 -DHAVE_COL_FCTS_C_TYPE=0
 
 # vector-scalar
 libVS_assemble%LIBCODE%_la_SOURCES = $(VSSV_assemble_sources)
 libVS_assemble%LIBCODE%_la_CPPFLAGS = \
  $(libalberta%LIBCODE%_la_CPPFLAGS)\
- -DHAVE_PSI_V_TYPE=1 -DHAVE_PHI_V_TYPE=0\
- -DHAVE_PSI_C_TYPE=0 -DHAVE_PHI_C_TYPE=0
+ -DHAVE_ROW_FCTS_V_TYPE=1 -DHAVE_COL_FCTS_V_TYPE=0\
+ -DHAVE_ROW_FCTS_C_TYPE=0 -DHAVE_COL_FCTS_C_TYPE=0
 
 # scalar-vector
 libSV_assemble%LIBCODE%_la_SOURCES = $(VSSV_assemble_sources)
 libSV_assemble%LIBCODE%_la_CPPFLAGS = \
  $(libalberta%LIBCODE%_la_CPPFLAGS)\
- -DHAVE_PSI_V_TYPE=0 -DHAVE_PHI_V_TYPE=1\
- -DHAVE_PSI_C_TYPE=0 -DHAVE_PHI_C_TYPE=0
+ -DHAVE_ROW_FCTS_V_TYPE=0 -DHAVE_COL_FCTS_V_TYPE=1\
+ -DHAVE_ROW_FCTS_C_TYPE=0 -DHAVE_COL_FCTS_C_TYPE=0
 
 if ALBERTA_USE_GRAPHICS
 lib_LTLIBRARIES += libalberta_gfx%LIBCODE%.la