diff --git a/src/main/java/org/springframework/data/elasticsearch/client/NodeClientFactoryBean.java b/src/main/java/org/springframework/data/elasticsearch/client/NodeClientFactoryBean.java
index a691ffa4d..9db1c1660 100644
--- a/src/main/java/org/springframework/data/elasticsearch/client/NodeClientFactoryBean.java
+++ b/src/main/java/org/springframework/data/elasticsearch/client/NodeClientFactoryBean.java
@@ -36,7 +36,7 @@ public class NodeClientFactoryBean implements FactoryBean<NodeClient>, Initializ
 
     private static final Logger logger = LoggerFactory.getLogger(NodeClientFactoryBean.class);
     private boolean local;
-    private boolean data;
+    private boolean purgeDataOnShutdown;
     private NodeClient nodeClient;
 
     NodeClientFactoryBean() {
@@ -63,15 +63,15 @@ public class NodeClientFactoryBean implements FactoryBean<NodeClient>, Initializ
 
     @Override
     public void afterPropertiesSet() throws Exception {
-        nodeClient = (NodeClient) nodeBuilder().local(this.local).data(this.data).node().client();
+        nodeClient = (NodeClient) nodeBuilder().local(this.local).data(this.purgeDataOnShutdown).node().client();
     }
 
     public void setLocal(boolean local) {
         this.local = local;
     }
 
-    public void setData(boolean data) {
-        this.data = data;
+    public void setPurgeDataOnShutdown(boolean purgeDataOnShutdown) {
+        this.purgeDataOnShutdown = purgeDataOnShutdown;
     }
 
     @Override
diff --git a/src/main/java/org/springframework/data/elasticsearch/config/NodeClientBeanDefinitionParser.java b/src/main/java/org/springframework/data/elasticsearch/config/NodeClientBeanDefinitionParser.java
index 5d4af27c1..66ef74461 100644
--- a/src/main/java/org/springframework/data/elasticsearch/config/NodeClientBeanDefinitionParser.java
+++ b/src/main/java/org/springframework/data/elasticsearch/config/NodeClientBeanDefinitionParser.java
@@ -41,7 +41,7 @@ public class NodeClientBeanDefinitionParser extends AbstractBeanDefinitionParser
 
     private void setLocalSettings(Element element, BeanDefinitionBuilder builder) {
         builder.addPropertyValue("local", Boolean.valueOf(element.getAttribute("local")));
-        builder.addPropertyValue("data", Boolean.valueOf(element.getAttribute("data")));
+        builder.addPropertyValue("purgeDataOnShutdown", Boolean.valueOf(element.getAttribute("purge-data-on-shutdown")));
     }
 
 
diff --git a/src/main/resources/org/springframework/data/elasticsearch/config/spring-elasticsearch-1.0.xsd b/src/main/resources/org/springframework/data/elasticsearch/config/spring-elasticsearch-1.0.xsd
index 15b97313d..e758eacef 100644
--- a/src/main/resources/org/springframework/data/elasticsearch/config/spring-elasticsearch-1.0.xsd
+++ b/src/main/resources/org/springframework/data/elasticsearch/config/spring-elasticsearch-1.0.xsd
@@ -45,7 +45,7 @@
             <xsd:complexContent>
                 <xsd:extension base="beans:identifiedType">
                     <xsd:attribute name="local" type="xsd:boolean" default="false"/>
-                    <xsd:attribute name="data" type="xsd:boolean" default="false"/>
+                    <xsd:attribute name="purge-data-on-shutdown" type="xsd:boolean" default="false"/>
                 </xsd:extension>
             </xsd:complexContent>
         </xsd:complexType>
diff --git a/src/test/resources/infrastructure.xml b/src/test/resources/infrastructure.xml
index 2c9e5c339..0e2ef2b1e 100644
--- a/src/test/resources/infrastructure.xml
+++ b/src/test/resources/infrastructure.xml
@@ -5,6 +5,6 @@
        xsi:schemaLocation="http://www.springframework.org/schema/data/elasticsearch http://www.springframework.org/schema/data/elasticsearch/spring-elasticsearch.xsd
 		http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd">
 
-    <elasticsearch:node-client id="client" local="true" data="false" />
+    <elasticsearch:node-client id="client" local="true" purge-data-on-shutdown="false" />
 
 </beans>
\ No newline at end of file