diff --git a/config/configure.ac b/config/configure.ac
index d66addcde184101110066d1bf8a6bcfaf6d1c88b..3817eba155765e644b61927df6f5ac74fd3ed455 100644
--- a/config/configure.ac
+++ b/config/configure.ac
@@ -231,7 +231,7 @@ AC_SUBST(OCAMLP4_LOC)
 
 AC_SUBST(SET_MAKE)
 
-AC_CONFIG_FILES([./Makefile config/Makefile src/Makefile.master src/Makefile.common src/Makefile src/utils/Makefile src/logic/Makefile src/grammars/Makefile src/acg-data/Makefile src/scripting/Makefile src/datalog/Makefile src/reduction/Makefile src/s_datalog/Makefile])
+AC_CONFIG_FILES([./Makefile config/Makefile src/Makefile.master src/Makefile.common src/Makefile src/utils/Makefile src/logic/Makefile src/grammars/Makefile src/acg-data/Makefile src/scripting/Makefile src/datalog.prover/Makefile src/reduction/Makefile src/datalog.solver/Makefile])
 
 AC_PROG_MAKE_SET
 
diff --git a/configure b/configure
index 4fa1bc30686a96355a3fb5a2a8f0c033974d1e56..fb7ac1c1b245af4afa0bf9e8c23d9f0723e2c3b3 100755
--- a/configure
+++ b/configure
@@ -1,6 +1,6 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.69 for ACG DTK 0.1.
+# Generated by GNU Autoconf 2.69 for ACG DTK $VERSION.
 #
 # Report bugs to <sylvain.pogodalla@loria.fr>.
 #
@@ -579,8 +579,8 @@ MAKEFLAGS=
 # Identity of this package.
 PACKAGE_NAME='ACG DTK'
 PACKAGE_TARNAME='acg-dtk'
-PACKAGE_VERSION='0.1'
-PACKAGE_STRING='ACG DTK 0.1'
+PACKAGE_VERSION='$VERSION'
+PACKAGE_STRING='ACG DTK $VERSION'
 PACKAGE_BUGREPORT='sylvain.pogodalla@loria.fr'
 PACKAGE_URL=''
 
@@ -1203,7 +1203,7 @@ if test "$ac_init_help" = "long"; then
   # Omit some internal or obsolete options to make the list less imposing.
   # This message is too long to be a string in the A/UX 3.1 sh.
   cat <<_ACEOF
-\`configure' configures ACG DTK 0.1 to adapt to many kinds of systems.
+\`configure' configures ACG DTK $VERSION to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1264,7 +1264,7 @@ fi
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of ACG DTK 0.1:";;
+     short | recursive ) echo "Configuration of ACG DTK $VERSION:";;
    esac
   cat <<\_ACEOF
 
@@ -1350,7 +1350,7 @@ fi
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-ACG DTK configure 0.1
+ACG DTK configure $VERSION
 generated by GNU Autoconf 2.69
 
 Copyright (C) 2012 Free Software Foundation, Inc.
@@ -1367,7 +1367,7 @@ cat >config.log <<_ACEOF
 This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.
 
-It was created by ACG DTK $as_me 0.1, which was
+It was created by ACG DTK $as_me $VERSION, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   $ $0 $@
@@ -2953,7 +2953,7 @@ $as_echo "$OCAMLP4 calls will be done with the $CAMLP4_LIB library" >&6; }
 
 
 
-ac_config_files="$ac_config_files ./Makefile config/Makefile src/Makefile.master src/Makefile.common src/Makefile src/utils/Makefile src/logic/Makefile src/grammars/Makefile src/acg-data/Makefile src/scripting/Makefile src/datalog/Makefile src/reduction/Makefile src/s_datalog/Makefile"
+ac_config_files="$ac_config_files ./Makefile config/Makefile src/Makefile.master src/Makefile.common src/Makefile src/utils/Makefile src/logic/Makefile src/grammars/Makefile src/acg-data/Makefile src/scripting/Makefile src/datalog.prover/Makefile src/reduction/Makefile src/datalog.solver/Makefile"
 
 
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether ${MAKE-make} sets \$(MAKE)" >&5
@@ -3530,7 +3530,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
 # report actual input values of CONFIG_FILES etc. instead of their
 # values after options handling.
 ac_log="
-This file was extended by ACG DTK $as_me 0.1, which was
+This file was extended by ACG DTK $as_me $VERSION, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -3583,7 +3583,7 @@ _ACEOF
 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
 ac_cs_version="\\
-ACG DTK config.status 0.1
+ACG DTK config.status $VERSION
 configured by $0, generated by GNU Autoconf 2.69,
   with options \\"\$ac_cs_config\\"
 
@@ -3703,9 +3703,9 @@ do
     "src/grammars/Makefile") CONFIG_FILES="$CONFIG_FILES src/grammars/Makefile" ;;
     "src/acg-data/Makefile") CONFIG_FILES="$CONFIG_FILES src/acg-data/Makefile" ;;
     "src/scripting/Makefile") CONFIG_FILES="$CONFIG_FILES src/scripting/Makefile" ;;
-    "src/datalog/Makefile") CONFIG_FILES="$CONFIG_FILES src/datalog/Makefile" ;;
+    "src/datalog.prover/Makefile") CONFIG_FILES="$CONFIG_FILES src/datalog.prover/Makefile" ;;
     "src/reduction/Makefile") CONFIG_FILES="$CONFIG_FILES src/reduction/Makefile" ;;
-    "src/s_datalog/Makefile") CONFIG_FILES="$CONFIG_FILES src/s_datalog/Makefile" ;;
+    "src/datalog.solver/Makefile") CONFIG_FILES="$CONFIG_FILES src/datalog.solver/Makefile" ;;
 
   *) as_fn_error $? "invalid argument: \`$ac_config_target'" "$LINENO" 5;;
   esac