diff --git a/solr/exampleSolr/README.txt b/solr/homeDirectoryTemplate/README.txt
similarity index 100%
rename from solr/exampleSolr/README.txt
rename to solr/homeDirectoryTemplate/README.txt
diff --git a/solr/exampleSolr/conf/admin-extra.html b/solr/homeDirectoryTemplate/conf/admin-extra.html
similarity index 100%
rename from solr/exampleSolr/conf/admin-extra.html
rename to solr/homeDirectoryTemplate/conf/admin-extra.html
diff --git a/solr/exampleSolr/conf/elevate.xml b/solr/homeDirectoryTemplate/conf/elevate.xml
similarity index 100%
rename from solr/exampleSolr/conf/elevate.xml
rename to solr/homeDirectoryTemplate/conf/elevate.xml
diff --git a/solr/exampleSolr/conf/mapping-FoldToASCII.txt b/solr/homeDirectoryTemplate/conf/mapping-FoldToASCII.txt
similarity index 100%
rename from solr/exampleSolr/conf/mapping-FoldToASCII.txt
rename to solr/homeDirectoryTemplate/conf/mapping-FoldToASCII.txt
diff --git a/solr/exampleSolr/conf/mapping-ISOLatin1Accent.txt b/solr/homeDirectoryTemplate/conf/mapping-ISOLatin1Accent.txt
similarity index 100%
rename from solr/exampleSolr/conf/mapping-ISOLatin1Accent.txt
rename to solr/homeDirectoryTemplate/conf/mapping-ISOLatin1Accent.txt
diff --git a/solr/exampleSolr/conf/protwords.txt b/solr/homeDirectoryTemplate/conf/protwords.txt
similarity index 100%
rename from solr/exampleSolr/conf/protwords.txt
rename to solr/homeDirectoryTemplate/conf/protwords.txt
diff --git a/solr/exampleSolr/conf/schema.xml b/solr/homeDirectoryTemplate/conf/schema.xml
similarity index 100%
rename from solr/exampleSolr/conf/schema.xml
rename to solr/homeDirectoryTemplate/conf/schema.xml
diff --git a/solr/exampleSolr/conf/scripts.conf b/solr/homeDirectoryTemplate/conf/scripts.conf
similarity index 100%
rename from solr/exampleSolr/conf/scripts.conf
rename to solr/homeDirectoryTemplate/conf/scripts.conf
diff --git a/solr/exampleSolr/conf/solrconfig.xml b/solr/homeDirectoryTemplate/conf/solrconfig.xml
similarity index 100%
rename from solr/exampleSolr/conf/solrconfig.xml
rename to solr/homeDirectoryTemplate/conf/solrconfig.xml
diff --git a/solr/exampleSolr/conf/spellings.txt b/solr/homeDirectoryTemplate/conf/spellings.txt
similarity index 100%
rename from solr/exampleSolr/conf/spellings.txt
rename to solr/homeDirectoryTemplate/conf/spellings.txt
diff --git a/solr/exampleSolr/conf/stopwords-name.txt b/solr/homeDirectoryTemplate/conf/stopwords-name.txt
similarity index 100%
rename from solr/exampleSolr/conf/stopwords-name.txt
rename to solr/homeDirectoryTemplate/conf/stopwords-name.txt
diff --git a/solr/exampleSolr/conf/stopwords.txt b/solr/homeDirectoryTemplate/conf/stopwords.txt
similarity index 100%
rename from solr/exampleSolr/conf/stopwords.txt
rename to solr/homeDirectoryTemplate/conf/stopwords.txt
diff --git a/solr/exampleSolr/conf/syn.txt b/solr/homeDirectoryTemplate/conf/syn.txt
similarity index 100%
rename from solr/exampleSolr/conf/syn.txt
rename to solr/homeDirectoryTemplate/conf/syn.txt
diff --git a/solr/exampleSolr/conf/synonyms.txt b/solr/homeDirectoryTemplate/conf/synonyms.txt
similarity index 100%
rename from solr/exampleSolr/conf/synonyms.txt
rename to solr/homeDirectoryTemplate/conf/synonyms.txt
diff --git a/solr/exampleSolr/conf/xslt/example.xsl b/solr/homeDirectoryTemplate/conf/xslt/example.xsl
similarity index 100%
rename from solr/exampleSolr/conf/xslt/example.xsl
rename to solr/homeDirectoryTemplate/conf/xslt/example.xsl
diff --git a/solr/exampleSolr/conf/xslt/example_atom.xsl b/solr/homeDirectoryTemplate/conf/xslt/example_atom.xsl
similarity index 100%
rename from solr/exampleSolr/conf/xslt/example_atom.xsl
rename to solr/homeDirectoryTemplate/conf/xslt/example_atom.xsl
diff --git a/solr/exampleSolr/conf/xslt/example_rss.xsl b/solr/homeDirectoryTemplate/conf/xslt/example_rss.xsl
similarity index 100%
rename from solr/exampleSolr/conf/xslt/example_rss.xsl
rename to solr/homeDirectoryTemplate/conf/xslt/example_rss.xsl
diff --git a/solr/exampleSolr/conf/xslt/luke.xsl b/solr/homeDirectoryTemplate/conf/xslt/luke.xsl
similarity index 100%
rename from solr/exampleSolr/conf/xslt/luke.xsl
rename to solr/homeDirectoryTemplate/conf/xslt/luke.xsl
diff --git a/solr/exampleSolr/solr.xml b/solr/homeDirectoryTemplate/solr.xml
similarity index 100%
rename from solr/exampleSolr/solr.xml
rename to solr/homeDirectoryTemplate/solr.xml
diff --git a/webapp/build.xml b/webapp/build.xml
index a8ee24c8a..78c292bbe 100644
--- a/webapp/build.xml
+++ b/webapp/build.xml
@@ -246,7 +246,7 @@ deploy   - Deploy the application directly into the Tomcat webapps directory.
 		<mkdir dir="${solr.build.dir}" />
 
 		<property name="solr.distrib.dir" location="${corebase.dir}/../solr" />
-		<property name="solr.example.dir" location="${solr.distrib.dir}/exampleSolr" />
+		<property name="solr.home.template.dir" location="${solr.distrib.dir}/homeDirectoryTemplate" />
 		<property name="solr.context.template.file" location="${solr.distrib.dir}/template.context.xml" />
 		<property name="solr.distrib.war" location="${solr.distrib.dir}/apache-solr-3.1.0.war" />
 
@@ -262,7 +262,7 @@ deploy   - Deploy the application directly into the Tomcat webapps directory.
 
 		<!-- Create and copy the example directory to the solr.home.dir directory. -->
 		<copy todir="${solr.home.dir}">
-			<fileset dir="${solr.example.dir}" includes="**/*" />
+			<fileset dir="${solr.home.template.dir}" includes="**/*" />
 		</copy>
 
 		<!-- Create the context configuration XML with expanded properties. Store it in a temp file for now. -->