diff --git a/Makefile b/Makefile
index 60ef8e64c0e45124256ebc934e5a7bb8fd3f7104..68ba9e08a827badb70653c14aa7086d559c49f6d 100644
--- a/Makefile
+++ b/Makefile
@@ -747,7 +747,7 @@ $(eval $(call include_generic_plugin_Makefile,$(PLUGIN_NAME)))
 # Evolved Value Analysis #
 ##################
 
-PLUGIN_ENABLE:=$(ENABLE_VALUE_ANALYSIS)
+PLUGIN_ENABLE:=$(ENABLE_EVA)
 PLUGIN_NAME:=Eva
 PLUGIN_DIR:=src/plugins/value
 PLUGIN_EXTRA_DIRS:=engine values domains domains/cvalue domains/apron \
diff --git a/configure.in b/configure.in
index 7c191bf2fbded68e767f72278f4643c35c161540..18e1a3af1b2cedb6e77d2999b30c8c9de5b0f939 100644
--- a/configure.in
+++ b/configure.in
@@ -703,7 +703,7 @@ check_plugin(callgraph, src/plugins/callgraph,
 
 plugin_use_external(callgraph,dot)
 plugin_use(callgraph,gui)
-plugin_use(callgraph,value_analysis)
+plugin_use(callgraph,eva)
 
 # constant propagation
 ######################
@@ -711,14 +711,14 @@ plugin_use(callgraph,value_analysis)
 check_plugin(semantic_constant_folding, src/plugins/constant_propagation,
              [support for constant propagation plugin],yes)
 
-plugin_require(semantic_constant_folding,value_analysis)
+plugin_require(semantic_constant_folding,eva)
 
 # from
 ######
 
 check_plugin(from_analysis,src/plugins/from,[support for from analysis],yes)
 
-plugin_require(from_analysis,value_analysis)
+plugin_require(from_analysis,eva)
 plugin_require(from_analysis,callgraph)
 
 # gui
@@ -739,7 +739,7 @@ check_plugin(impact,src/plugins/impact,[support for impact plugin],yes)
 plugin_use(impact,gui)
 plugin_use(impact,slicing)
 plugin_require(impact,pdg)
-plugin_require(impact,value_analysis)
+plugin_require(impact,eva)
 plugin_require(impact,inout)
 
 # inout
@@ -747,14 +747,14 @@ plugin_require(impact,inout)
 
 check_plugin(inout,src/plugins/inout,[support for inout analysis],yes)
 plugin_require(inout,from_analysis)
-plugin_require(inout,value_analysis)
+plugin_require(inout,eva)
 plugin_require(inout,callgraph)
 
 # metrics
 #########
 
 check_plugin(metrics,src/plugins/metrics,[support for metrics analysis],yes)
-plugin_use(metrics,value_analysis)
+plugin_use(metrics,eva)
 plugin_use(metrics,gui)
 
 # occurrence
@@ -763,14 +763,14 @@ plugin_use(metrics,gui)
 check_plugin(occurrence,src/plugins/occurrence,
              [support for occurrence analysis],yes)
 plugin_use(occurrence,gui)
-plugin_require(occurrence,value_analysis)
+plugin_require(occurrence,eva)
 
 # pdg
 #####
 
 check_plugin(pdg,src/plugins/pdg,[support for pdg plugin],yes,pdg_types)
 plugin_require(pdg,from_analysis)
-plugin_require(pdg,value_analysis)
+plugin_require(pdg,eva)
 plugin_require(pdg,callgraph)
 
 # postdominators
@@ -790,7 +790,7 @@ check_plugin(rtegen,src/plugins/rte,
 
 check_plugin(scope,src/plugins/scope,[support for scope plugin],yes)
 plugin_require(scope,postdominators)
-plugin_require(scope,value_analysis)
+plugin_require(scope,eva)
 plugin_require(scope,from_analysis)
 plugin_require(scope,pdg)
 plugin_use(scope,gui)
@@ -801,7 +801,7 @@ plugin_use(scope,gui)
 check_plugin(slicing,src/plugins/slicing,[support for slicing plugin],yes)
 plugin_require(slicing,from_analysis)
 plugin_require(slicing,pdg)
-plugin_require(slicing,value_analysis)
+plugin_require(slicing,eva)
 plugin_require(slicing,callgraph)
 plugin_use(slicing,gui)
 
@@ -811,23 +811,23 @@ plugin_use(slicing,gui)
 check_plugin(sparecode,src/plugins/sparecode,
              [support for sparecode plugin],yes)
 plugin_require(sparecode,pdg)
-plugin_require(sparecode,value_analysis)
+plugin_require(sparecode,eva)
 
 # users
 #######
 
 check_plugin(users,src/plugins/users,[support for users analysis],yes)
-plugin_require(users,value_analysis)
+plugin_require(users,eva)
 plugin_use(users,callgraph)
 
 # value
 #######
 
-check_plugin(value_analysis,src/plugins/value,
+check_plugin(eva,src/plugins/value,
              [support for value analysis],yes)
-plugin_use(value_analysis,gui)
-plugin_use(value_analysis,scope)
-plugin_use(value_analysis,callgraph)
+plugin_use(eva,gui)
+plugin_use(eva,scope)
+plugin_use(eva,callgraph)
 
 ####################
 # External plugins #
diff --git a/share/Makefile.config.in b/share/Makefile.config.in
index a1ebb45aba7dd8bee1ac16d71e52080975c1eb36..e15ae74ad6ddef3dcce896509e50b47eee0d8e3f 100644
--- a/share/Makefile.config.in
+++ b/share/Makefile.config.in
@@ -173,7 +173,7 @@ ENABLE_SCOPE	                  ?=@ENABLE_SCOPE@
 ENABLE_SLICING	                  ?=@ENABLE_SLICING@
 ENABLE_SPARECODE                  ?=@ENABLE_SPARECODE@
 ENABLE_USERS	                  ?=@ENABLE_USERS@
-ENABLE_VALUE_ANALYSIS             ?=@ENABLE_VALUE_ANALYSIS@
+ENABLE_EVA                      ?=@ENABLE_EVA@
 
 #bytes is part of the stdlib, but is used as a transitional package.
 LIBRARY_NAMES := findlib ocamlgraph unix str dynlink bytes zarith
diff --git a/src/plugins/nonterm/configure.ac b/src/plugins/nonterm/configure.ac
index 535e73e87ca3ae6f41de36e88620c9e7df0284c5..c87bed3e956dbd0d25378d18539c87ebd88ff136 100644
--- a/src/plugins/nonterm/configure.ac
+++ b/src/plugins/nonterm/configure.ac
@@ -38,7 +38,7 @@ m4_ifndef([FRAMAC_M4_MACROS], [m4_include(FRAMAC_SHARE/configure.ac)])
 check_plugin(nonterm,PLUGIN_RELATIVE_PATH(plugin_file),
              [support for nonterm plug-in],yes)
 
-plugin_require(nonterm,value_analysis)
+plugin_require(nonterm,eva)
 
 #######################
 # Generating Makefile #
diff --git a/src/plugins/security_slicing/configure.ac b/src/plugins/security_slicing/configure.ac
index 602bef23a4deda95a6a69aa1b28fcdd773fb04e7..bd2896471aa66cff305a4ae2214a62e77c69cdc2 100644
--- a/src/plugins/security_slicing/configure.ac
+++ b/src/plugins/security_slicing/configure.ac
@@ -35,7 +35,7 @@ check_plugin(security_slicing,PLUGIN_RELATIVE_PATH(plugin_file),
 	     [support for Security_slicing plug-in],yes)
 
 plugin_require(security_slicing,slicing)
-plugin_require(security_slicing,value_analysis)
+plugin_require(security_slicing,eva)
 plugin_require(security_slicing,pdg)
 plugin_require(security_slicing,gui)
 check_plugin_dependencies