Index: docs/gettingstarted/src/main/docbook/en-US/content/author_group.xml
===================================================================
--- docs/gettingstarted/src/main/docbook/en-US/content/author_group.xml	(revision 989)
+++ docs/gettingstarted/src/main/docbook/en-US/content/author_group.xml	Thu Jan 14 09:01:45 CET 2010
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
-  ~ JBoss DNA (http://www.jboss.org/dna)
+  ~ ModeShape (http://www.modeshape.org)
   ~
   ~ See the COPYRIGHT.txt file distributed with this work for information
   ~ regarding copyright ownership.  Some portions may be licensed
@@ -8,12 +8,12 @@
   ~ See the AUTHORS.txt file in the distribution for a full listing of 
   ~ individual contributors.
   ~
-  ~ JBoss DNA is free software. Unless otherwise indicated, all code in JBoss DNA
+  ~ ModeShape is free software. Unless otherwise indicated, all code in ModeShape
   ~ is licensed to you under the terms of the GNU Lesser General Public License as
   ~ published by the Free Software Foundation; either version 2.1 of
   ~ the License, or (at your option) any later version.
   ~
-  ~ JBoss DNA is distributed in the hope that it will be useful,
+  ~ ModeShape is distributed in the hope that it will be useful,
   ~ but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
   ~ or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License
   ~ for more details.
@@ -33,4 +33,4 @@
   <corpauthor>John Verhaeg</corpauthor>
   <corpauthor>Stefano Maestri</corpauthor>
   <corpauthor>Serge Emmanuel Pagop</corpauthor>
-</authorgroup>
\ No newline at end of file
+</authorgroup>
Index: docs/gettingstarted/src/main/docbook/en-US/content/downloading_and_running.xml
===================================================================
--- docs/gettingstarted/src/main/docbook/en-US/content/downloading_and_running.xml	(revision 1584)
+++ docs/gettingstarted/src/main/docbook/en-US/content/downloading_and_running.xml	Thu Jan 14 09:20:32 CET 2010
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
-  ~ JBoss DNA (http://www.jboss.org/dna)
+  ~ ModeShape (http://www.modeshape.org)
   ~
   ~ See the COPYRIGHT.txt file distributed with this work for information
   ~ regarding copyright ownership.  Some portions may be licensed
@@ -8,12 +8,12 @@
   ~ See the AUTHORS.txt file in the distribution for a full listing of 
   ~ individual contributors.
   ~
-  ~ JBoss DNA is free software. Unless otherwise indicated, all code in JBoss DNA
+  ~ ModeShape is free software. Unless otherwise indicated, all code in ModeShape
   ~ is licensed to you under the terms of the GNU Lesser General Public License as
   ~ published by the Free Software Foundation; either version 2.1 of
   ~ the License, or (at your option) any later version.
   ~
-  ~ JBoss DNA is distributed in the hope that it will be useful,
+  ~ ModeShape is distributed in the hope that it will be useful,
   ~ but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
   ~ or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License
   ~ for more details.
@@ -31,17 +31,17 @@
 <chapter id="downloading_and_running">
 	<title>Running the example applications</title>
 	<para>
-    This chapter provides instructions for downloading and running a sample application that demonstrates how JBoss DNA works
+    This chapter provides instructions for downloading and running a sample application that demonstrates how ModeShape works
     with a JCR repository to automatically sequence changing content to extract useful information. So read on to get the simple
     application running.
   </para>
-	<para>JBoss DNA uses Maven 2 for its build system, as does this example. Using Maven 2 has several advantages, including
+	<para>ModeShape uses Maven 2 for its build system, as does this example. Using Maven 2 has several advantages, including
     the ability to manage dependencies. If a library is needed, Maven automatically finds and downloads that library, plus
     everything that library needs. This means that it's very easy to build the examples - or even create a maven project that
-    depends on the JBoss DNA JARs.</para>
+    depends on the ModeShape JARs.</para>
 	<note>
 		<para>
-      To use Maven with JBoss DNA, you'll need to have <ulink url="http://java.sun.com/javase/downloads/index_jdk5.jsp">JDK 5 or 6</ulink>
+      To use Maven with ModeShape, you'll need to have <ulink url="http://java.sun.com/javase/downloads/index_jdk5.jsp">JDK 5 or 6</ulink>
       and Maven 2.0.9 (or higher).</para>
 		<para>
       Maven can be downloaded from <ulink url="http://maven.apache.org/">http://maven.apache.org/</ulink>, and is installed by unzipping the
@@ -93,11 +93,11 @@
 </settings>
 ]]></programlisting>
 		<para>This profile informs Maven of the two JBoss repositories (snapshots and releases) that contain 
-        all of the JARs for JBoss DNA and all dependent libraries.</para>
+        all of the JARs for ModeShape and all dependent libraries.</para>
 	</note>
 	<sect1 id="downloading">
 		<title>Downloading and compiling</title>
-		<para>The next step is to <ulink url="http://downloads.jboss.org/jbossdna/0.7/jboss-dna-0.7-gettingstarted-examples.zip">download</ulink>
+		<para>The next step is to <ulink url="http://downloads.jboss.org/modeshape/0.7/modeshape-1.0.0.Beta1-gettingstarted-examples.zip">download</ulink>
       the example for this Getting Started guide, and extract the contents to a convenient location on your local disk.
       You'll find the example contains the following files, which are organized according to the standard Maven directory structure:</para>
 		<programlisting><![CDATA[
@@ -123,7 +123,7 @@
 		  while all of the source for the repository example is located in the <code>repository</code> subdirectory.
 		</para>
 		<para>
-			And you may have noticed that none of the JBoss DNA libraries are there.  This is where Maven comes in.  
+			And you may have noticed that none of the ModeShape libraries are there.  This is where Maven comes in.  
 			The two <code>pom.xml</code> files tell Maven everything it needs to know about what libraries are required and 
 			how to build the example.
 		</para>
@@ -132,7 +132,7 @@
 		</para>
 		<programlisting>$ mvn install</programlisting>
 		<para>  
-      This command downloads all of the JARs necessary to compile and build the example, including the JBoss DNA libraries,
+      This command downloads all of the JARs necessary to compile and build the example, including the ModeShape libraries,
       the libraries they depend on, and any missing Maven components.  (These are downloaded from the JBoss repositories
       only once and saved on your machine.  This means that the next time you run Maven, all the libraries will
       already be available locally, and the build will run much faster.)  The command then continues by compiling the example's source
@@ -158,7 +158,7 @@
 		<para>If there are errors, check whether you have the correct version of Maven installed and that you've correctly updated
       your Maven settings as described above.</para>
 		<para>If you've successfully built the examples, there will be a new <code>examples/sequencers/target/</code> directory that contains
-			all of the generated output for the sequencers example, including a <code>dna-example-sequencers-basic.dir/</code> subdirectory 
+			all of the generated output for the sequencers example, including a <code>modeshape-example-sequencers-basic.dir/</code> subdirectory 
 			that contains the following:
 			<itemizedlist>
 				<listitem>
@@ -196,14 +196,14 @@
 				  </para>
 				</listitem>
 				<listitem>
-					<para><emphasis role="strong"><code>lib</code></emphasis> subdirectory contains the JARs for all of the JBoss DNA artifacts 
-					  as well as those for other libraries required by JBoss DNA and the sequencer example.
+					<para><emphasis role="strong"><code>lib</code></emphasis> subdirectory contains the JARs for all of the ModeShape artifacts 
+					  as well as those for other libraries required by ModeShape and the sequencer example.
 			      </para>
 				</listitem>
 			</itemizedlist>
 		</para>
 		<para>Similarly, the <code>examples/repository/target/</code> directory contains all of the generated output for the repository example, including
-			a <code>dna-example-repository-basic.dir/</code> subdirectory that contains the following:
+			a <code>modeshape-example-repository-basic.dir/</code> subdirectory that contains the following:
 			<itemizedlist>
 				<listitem>
 					<para><emphasis role="strong"><code>run.sh</code></emphasis> is the *nix shell script that will run the repository example application.</para>
@@ -217,7 +217,7 @@
 				<listitem>
 					<para><emphasis role="strong"><code>configRepository.xml</code></emphasis> is an XML file containing the information that the
 					  example application loads as its configuration and which defines the sources, repositories, sequencers (if used), and other
-					  components that make up the DNA JCR engine.
+					  components that make up the ModeShape JCR engine.
 					</para>
 				</listitem>
 				<listitem>
@@ -249,8 +249,8 @@
 				  </para>
 				</listitem>
 				<listitem>
-					<para><emphasis role="strong"><code>lib</code></emphasis> subdirectory contains the JARs for all of the JBoss DNA artifacts
-					  as well as those for other libraries required by JBoss DNA and the repository example. There are a lot of libraries here,
+					<para><emphasis role="strong"><code>lib</code></emphasis> subdirectory contains the JARs for all of the ModeShape artifacts
+					  as well as those for other libraries required by ModeShape and the repository example. There are a lot of libraries here,
 					  but almost all of them are from the JPA connector (which depends upon Hibernate), HSQLDB, Lucene, and the JAAS implementation.
 			      </para>
 				</listitem>
Index: docs/gettingstarted/src/main/docbook/en-US/content/sequencer_example.xml
===================================================================
--- docs/gettingstarted/src/main/docbook/en-US/content/sequencer_example.xml	(revision 1584)
+++ docs/gettingstarted/src/main/docbook/en-US/content/sequencer_example.xml	Thu Jan 14 09:22:48 CET 2010
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
-  ~ JBoss DNA (http://www.jboss.org/dna)
+  ~ ModeShape (http://www.modeshape.org)
   ~
   ~ See the COPYRIGHT.txt file distributed with this work for information
   ~ regarding copyright ownership.  Some portions may be licensed
@@ -8,12 +8,12 @@
   ~ See the AUTHORS.txt file in the distribution for a full listing of 
   ~ individual contributors.
   ~
-  ~ JBoss DNA is free software. Unless otherwise indicated, all code in JBoss DNA
+  ~ ModeShape is free software. Unless otherwise indicated, all code in ModeShape
   ~ is licensed to you under the terms of the GNU Lesser General Public License as
   ~ published by the Free Software Foundation; either version 2.1 of
   ~ the License, or (at your option) any later version.
   ~
-  ~ JBoss DNA is distributed in the hope that it will be useful,
+  ~ ModeShape is distributed in the hope that it will be useful,
   ~ but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
   ~ or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License
   ~ for more details.
@@ -38,7 +38,7 @@
 	<sect1 id="running_sequencer_example">
 		<title>Running the sequencing example</title>
 		<para>The sequencing example consists of a client application that sets up an in-memory JCR repository and that allows a user to
-      upload files into that repository. The client also sets up the DNA services with seven sequencers:
+      upload files into that repository. The client also sets up the ModeShape services with seven sequencers:
 	 		<itemizedlist>
 				<listitem>
 					<para>an image metadata sequencer that processes PNG, JPEG, GIF, BMP or other image filetypes to extract
@@ -66,12 +66,12 @@
       These sequencers automatically extract content from the files and store that content in the repository.
     </para>
 		<note>
-			<para>JBoss DNA includes several other sequencers, including sequencers for DDL files, Microsoft Office files, 
+			<para>ModeShape includes several other sequencers, including sequencers for DDL files, Microsoft Office files, 
 				JCR Compact Node Definition (CND) files, and XML files. Feel free to experiment with the example and add these
 				or even sequencers you write.</para>
 		</note>
 		<para>
-      To run the client application, go to the <code>examples/sequencers/target/dna-example-sequencers-basic.dir/</code>
+      To run the client application, go to the <code>examples/sequencers/target/modeshape-example-sequencers-basic.dir/</code>
       directory and type <code>./run.sh</code>. You should see the command-line client and its menus in your terminal:
       <figure id="example-sequencer-cli-client">
 				<title>Example client</title>
@@ -82,14 +82,14 @@
 		<para>
       The first step is to upload one of the example images. If you type 'u' and press return, you'll be prompted to supply the
       path to the file you want to upload. Since the application is running from within the
-      <code>examples/sequencers/target/dna-example-sequencers-basic.dir/</code> directory, you can specify any of the files 
+      <code>examples/sequencers/target/modeshape-example-sequencers-basic.dir/</code> directory, you can specify any of the files 
 			in that directory without specifying the path:
       <figure id="example-sequencer-upload">
 				<title>Uploading an image using the example client</title>
 				<graphic align="center" scale="60" fileref="example-sequencer-upload.png"/>
 			</figure>
       You can specify any fully-qualified or relative path. The application will notify you if it cannot find the file you
-      specified. The example client configures JBoss DNA to sequence MP3 audio files, Java source files, Java class files,
+      specified. The example client configures ModeShape to sequence MP3 audio files, Java source files, Java class files,
       ZIP files, text files (<code>.txt</code>), CSV files (<code>.csv</code>), or image files with one of
       the following extensions (technically, nodes that have names ending in the following):
       <code>jpg</code>, <code>jpeg</code>, <code>gif</code>, <code>bmp</code>, <code>pcx</code>, <code>png</code>,
@@ -116,12 +116,12 @@
                             @jcr:lastModified = {now}
 ]]></programlisting>
     <para>Other kinds of files are treated in a similar way.</para>
-		<para>When the client uploads the file using the JCR API, DNA gets notified of the changes, consults the sequencers to see whether
+		<para>When the client uploads the file using the JCR API, ModeShape gets notified of the changes, consults the sequencers to see whether
     	any of them are interested in the new or updated content, and if so runs those sequencers. The image sequencer processes image
     	files for metadata, and any metadata found is stored under the <code>/images</code> branch of the repository. The MP3 sequencer 
 			processes MP3 audio files for metadata, and any metadata found is stored under the <code>/mp3s</code>
     	branch of the repository.  And metadata about Java classes are stored under the <code>/java</code> area of the repository.
-      All of this happens asynchronously, so any DNA activity doesn't impede or slow down the client activities.
+      All of this happens asynchronously, so any ModeShape activity doesn't impede or slow down the client activities.
     </para>
 		<para>So, after the file is uploaded, you can search the repository for the image metadata using the "s" menu option:
     	<figure id="example-sequencer-search">
@@ -151,14 +151,14 @@
 	<sect1 id="example_application_review">
 		<title>Reviewing the example application</title>
 		<para>Recall that the example application consists of a client application that sets up an in-memory JCR repository and
-      that allows a user to upload files into that repository. The client also sets up the DNA services with an image sequencer so
-      that if any of the uploaded files are PNG, JPEG, GIF, BMP or other images, DNA will automatically extract the image's
+      that allows a user to upload files into that repository. The client also sets up the ModeShape services with an image sequencer so
+      that if any of the uploaded files are PNG, JPEG, GIF, BMP or other images, ModeShape will automatically extract the image's
       metadata (e.g., image format, physical size, pixel density, etc.) and store that in the repository.  Or, if the client uploads
       MP3 audio files, the title, author, album, year, and comment are extracted from the audio file and stored in the repository.</para>
 		<para>
       The example is comprised of 5 classes and 1 interface, located in the <code>src/main/java</code> directory:</para>
     <programlisting><![CDATA[
-  org/jboss/example/dna/sequencers/ConsoleInput.java
+  org/modeshape/example/sequencers/ConsoleInput.java
                                   /ContentInfo.java
                                   /JavaInfo.java
                                   /MediaInfo.java
@@ -177,7 +177,7 @@
 			a user entering data. This allows us to check the behavior of the client automatically using conventional JUnit test cases, 
 			as demonstrated by the code in the <code>src/test/java</code> directory:</para>
     <programlisting><![CDATA[
-  org/jboss/example/dna/sequencers/SequencingClientTest.java
+  org/modeshape/example/sequencers/SequencingClientTest.java
                                   /MockUserInterface.java
   ]]></programlisting>
 		<para>If we look at the <code>SequencingClient</code> code, there are a handful of methods that encapsulate the various activities.</para>
@@ -186,7 +186,7 @@
 				the code is more readable and concise.</para>
 		</note>
 		<para>The <code>main(String[] argv)</code> method is of course the method that is executed when the application is run.  This code
-		  creates the JBoss DNA configuration using the programmatic style.
+		  creates the ModeShape configuration using the programmatic style.
 		</para>
 		<programlisting role="JAVA"><![CDATA[// Create the configuration. 
 String repositoryId = "content";
@@ -204,7 +204,7 @@
       .setSource("store");
 // Set up the image sequencer ...
 config.sequencer("Image Sequencer")
-      .usingClass("org.jboss.dna.sequencer.image.ImageMetadataSequencer")
+      .usingClass("org.modeshape.sequencer.image.ImageMetadataSequencer")
       .loadedFromClasspath()
       .setDescription("Sequences image files to extract the characteristics of the image")
       .sequencingFrom(
@@ -212,7 +212,7 @@
       .andOutputtingTo("/images/$1");
 // Set up the MP3 sequencer ...
 config.sequencer("MP3 Sequencer")
-      .usingClass("org.jboss.dna.sequencer.mp3.Mp3MetadataSequencer")
+      .usingClass("org.modeshape.sequencer.mp3.Mp3MetadataSequencer")
       .loadedFromClasspath()
       .setDescription("Sequences mp3 files to extract the id3 tags of the audio file")
       .sequencingFrom("//(*.mp3[*])/jcr:content[@jcr:data]")
@@ -225,21 +225,21 @@
       .andOutputtingTo("/classes");
 // Set up the Java source file sequencer ...
 config.sequencer("Java Sequencer")
-      .usingClass("org.jboss.dna.sequencer.java.JavaMetadataSequencer")
+      .usingClass("org.modeshape.sequencer.java.JavaMetadataSequencer")
       .loadedFromClasspath()
       .setDescription("Sequences Java files to extract the AST structure of the Java source code")
       .sequencingFrom("//(*.java[*])/jcr:content[@jcr:data]")
       .andOutputtingTo("/java/$1");
 // Set up the CSV file sequencer ...
 config.sequencer("CSV Sequencer")
-      .usingClass("org.jboss.dna.sequencer.text.DelimitedTextSequencer")
+      .usingClass("org.modeshape.sequencer.text.DelimitedTextSequencer")
       .loadedFromClasspath()
       .setDescription("Sequences CSV files to extract the contents")
       .sequencingFrom("//(*.csv[*])/jcr:content[@jcr:data]")
       .andOutputtingTo("/csv/$1");
 // Set up the fixed width file sequencer ...
 config.sequencer("Fixed Width Sequencer")
-      .usingClass("org.jboss.dna.sequencer.text.FixedWidthTextSequencer")
+      .usingClass("org.modeshape.sequencer.text.FixedWidthTextSequencer")
       .loadedFromClasspath()
       .setDescription("Sequences fixed width files to extract the contents")
       .setProperty("commentMarker", "#")
@@ -272,7 +272,7 @@
 public void startRepository() throws Exception {
 		if (this.repository == null) {
 		    try {
-		        // Start the DNA engine ...
+		        // Start the ModeShape engine ...
 		        this.engine = this.configuration.build();
 		        this.engine.start();
 
@@ -300,7 +300,7 @@
 		}
 }
   ]]></programlisting>
-		<para>None of the other methods really do anything with JBoss DNA <emphasis>per se</emphasis>. Instead, they merely work with the repository
+		<para>None of the other methods really do anything with ModeShape <emphasis>per se</emphasis>. Instead, they merely work with the repository
       using the JCR API.</para>
 		<para>If we look at the <code>ConsoleInput</code> constructor, it starts the repository and a thread 
 			for the user interface. At this point, the constructor returns, but the main application continues under the user interface thread.  
@@ -340,7 +340,7 @@
 		<para>
 			There is one more aspect of this example that is worth discussing.  While the repository example in the
 			<link linkend="repository_example">next chapter</link> does show how to use JAAS, this example intentionally shows how
-			you might integrate a different security system into JBoss DNA.  In the <code>createSession()</code> method,
+			you might integrate a different security system into ModeShape.  In the <code>createSession()</code> method,
 			the <code>RepositoryClient</code> creates a <code>SecurityContextCredentials</code> wrapper around a custom
 			<code>SecurityContext</code> implementation, then passes that credentials into the <code>login(Credentials,String)</code>
 			method:
@@ -358,21 +358,21 @@
    <programlisting role="JAVA"><![CDATA[
 protected class MyCustomSecurityContext implements SecurityContext {
     /**
-     * @see org.jboss.dna.graph.SecurityContext#getUserName()
+     * @see org.modeshape.graph.SecurityContext#getUserName()
      */
     public String getUserName() {
         return "Fred";
     }
 
     /**
-     * @see org.jboss.dna.graph.SecurityContext#hasRole(java.lang.String)
+     * @see org.modeshape.graph.SecurityContext#hasRole(java.lang.String)
      */
     public boolean hasRole( String roleName ) {
         return true;
     }
 
     /**
-     * @see org.jboss.dna.graph.SecurityContext#logout()
+     * @see org.modeshape.graph.SecurityContext#logout()
      */
     public void logout() {
         // do something
@@ -380,7 +380,7 @@
 }
  ]]></programlisting>
 		<para>
-			Obviously you would want to implement this correctly.  If you're using JBoss DNA in a web application, your <code>SecurityContext</code>
+			Obviously you would want to implement this correctly.  If you're using ModeShape in a web application, your <code>SecurityContext</code>
 			implementation would likely delegate to the <code>HttpServletRequest</code>.
 		</para>
 		<para>
@@ -389,14 +389,14 @@
 			(see the repository example in the <link linkend="repository_example">next chapter</link>).  Or, you could use the approach listed
 			above and supply an instance of the <code>JaasSecurityContext</code> to the <code>SecurityContextCredentials</code>.
 		</para>
-		<para>At this point, we've reviewed all of the interesting code in the example application related to JBoss DNA.  However, feel free
+		<para>At this point, we've reviewed all of the interesting code in the example application related to ModeShape.  However, feel free
     to play with the application, trying different things.</para>
 	</sect1>
 	<sect1>
 		<title>What's next</title>
 		<para>
 			This chapter walked through running the sequencer example and looked at the example code.  With the sequencer client, you could upload files into a
-	    	JCR repository, while JBoss DNA automatically sequenced the source files you uploaded, extracted the metadata from the
+	    	JCR repository, while ModeShape automatically sequenced the source files you uploaded, extracted the metadata from the
 	    	files, and stored that metadata inside the repository.
 		</para>
 		<para>
Index: docs/gettingstarted/src/main/docbook/en-US/content/using_dna.xml
===================================================================
--- docs/gettingstarted/src/main/docbook/en-US/content/using_dna.xml	(revision 1584)
+++ docs/gettingstarted/src/main/docbook/en-US/content/using_modeshape.xml	Thu Jan 14 09:24:55 CET 2010
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
-  ~ JBoss DNA (http://www.jboss.org/dna)
+  ~ ModeShape (http://www.modeshape.org)
   ~
   ~ See the COPYRIGHT.txt file distributed with this work for information
   ~ regarding copyright ownership.  Some portions may be licensed
@@ -8,12 +8,12 @@
   ~ See the AUTHORS.txt file in the distribution for a full listing of 
   ~ individual contributors.
   ~
-  ~ JBoss DNA is free software. Unless otherwise indicated, all code in JBoss DNA
+  ~ ModeShape is free software. Unless otherwise indicated, all code in ModeShape
   ~ is licensed to you under the terms of the GNU Lesser General Public License as
   ~ published by the Free Software Foundation; either version 2.1 of
   ~ the License, or (at your option) any later version.
   ~
-  ~ JBoss DNA is distributed in the hope that it will be useful,
+  ~ ModeShape is distributed in the hope that it will be useful,
   ~ but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
   ~ or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License
   ~ for more details.
@@ -28,17 +28,17 @@
 <!ENTITY % CustomDTD SYSTEM "../custom.dtd">
 %CustomDTD;
 ]>
-<chapter id="using_dna">
-	<title>Using JBoss DNA</title>
-	<para>Using JBoss DNA within your application is actually quite straightforward.  As you'll see in this chapter,
-		the first step is setting up JBoss DNA and starting the <code>JcrEngine</code>.  After that, you obtain the
+<chapter id="using_modeshape">
+	<title>Using ModeShape</title>
+	<para>Using ModeShape within your application is actually quite straightforward.  As you'll see in this chapter,
+		the first step is setting up ModeShape and starting the <code>JcrEngine</code>.  After that, you obtain the
 		<code>javax.jcr.Repository</code> instance for a named repository and just use the standard JCR API throughout your
 		application.
 	</para>
 	<sect1 id="jcr_engine">
-		<title>JBoss DNA's JcrEngine</title>
+		<title>ModeShape's JcrEngine</title>
 		<para>
-			JBoss DNA encapsulates everything necessary to run one or more JCR repositories into a single &JcrEngine; instance.
+			ModeShape encapsulates everything necessary to run one or more JCR repositories into a single &JcrEngine; instance.
 			This includes all underlying repository sources, the pools of connections to the sources, the sequencers,
 			the MIME type detector(s), and the &Repository; implementations.
 		</para>
@@ -83,8 +83,8 @@
 			<itemizedlist>
 				<listitem>
 					<para><emphasis role="strong"><code>Repository sources</code></emphasis> are the POJO objects that each describe a particular
-					location where content is stored.  Each repository source object is an instance of a JBoss DNA connector, and is configured
-					with the properties that particular source.  JBoss DNA's &RepositorySource; classes are analogous to JDBC's &DataSource; classes -
+					location where content is stored.  Each repository source object is an instance of a ModeShape connector, and is configured
+					with the properties that particular source.  ModeShape's &RepositorySource; classes are analogous to JDBC's &DataSource; classes -
 					they are implemented by specific connectors (aka, "drivers") for specific kinds of repository sources (aka, "databases").
 					Similarly, a &RepositorySource; instance is analogous to a &DataSource; instance, with bean properties for each configurable
 					parameter.  Therefore, each repository source definition must supply the name of the &RepositorySource; class, any
@@ -94,7 +94,7 @@
 					<para><emphasis role="strong"><code>Repositories</code></emphasis> define the JCR repositories that are available.  Each
 					repository has a unique name that is used to obtain the &Repository; instance from the &JcrEngine;'s <code>getRepository(String)</code>
 					method, but each repository definition also can include the predefined namespaces (other than those automatically defined by
-					JBoss DNA), various options, and the node types that are to be available in the repository without explicit registration
+					ModeShape), various options, and the node types that are to be available in the repository without explicit registration
 					through the JCR API.</para>
 				</listitem>
 				<listitem>
@@ -106,7 +106,7 @@
 				<listitem>
 					<para><emphasis role="strong"><code>MIME type detectors</code></emphasis> define the particular MIME type detector(s) that should
 					be made available.  A MIME type detector does exactly what the name implies: it attempts to determine the MIME type given a
-					"filename" and contents.  JBoss DNA automatically uses a detector that uses the file extension to identify the MIME type,
+					"filename" and contents.  ModeShape automatically uses a detector that uses the file extension to identify the MIME type,
 					but also provides an implementation that uses an external library to identify the MIME type based upon the contents.
 					The definition must state the name of the detector class, any bean properties and, optionally, the classpath that should 
 					be used to load the class.</para>
@@ -139,7 +139,7 @@
 		<sect2 id="loading_from_file">
 			<title>Loading from a configuration file</title>
 			<para>
-				Loading the JBoss DNA configuration from a file is actually very simple:
+				Loading the ModeShape configuration from a file is actually very simple:
 			</para>
     	<programlisting role="JAVA"><![CDATA[JcrConfiguration config = new JcrConfiguration();
 configuration.loadFrom(file);]]></programlisting>
@@ -163,70 +163,70 @@
 				have been removed for clarity):
 			</para>
     	<programlisting role="XML"><![CDATA[<?xml version="1.0" encoding="UTF-8"?>
-<configuration xmlns="http://www.jboss.org/dna/1.0" xmlns:jcr="http://www.jcp.org/jcr/1.0">
+<configuration xmlns="http://www.modeshape.org/1.0" xmlns:jcr="http://www.jcp.org/jcr/1.0">
 	  <!-- 
 	  Define the JCR repositories 
 	  -->
-	  <dna:repositories>
+	  <modeshape:repositories>
 	      <!-- 
 	      Define a JCR repository that accesses the 'Cars' source directly.
 	      -->
-	      <dna:repository jcr:name="car repository" dna:source="Cars">
-	          <dna:options jcr:primaryType="dna:options">
-	              <jaasLoginConfigName jcr:primaryType="dna:option" dna:value="dna-jcr"/>
+	      <modeshape:repository jcr:name="car repository" modeshape:source="Cars">
+	          <modeshape:options jcr:primaryType="modeshape:options">
+	              <jaasLoginConfigName jcr:primaryType="modeshape:option" modeshape:value="modeshape-jcr"/>
 	              <!--
-	              As a convenience, DNA defaults to granting guest users full access.  
+	              As a convenience, ModeShape defaults to granting guest users full access.  
 	              In a production system, you would want to limit this access by uncommenting one of the 
 	              options below:
 	              
 	              for no access:
-	              <anonymousUserRoles jcr:PrimaryType="dna:option" dna:value="" />
+	              <anonymousUserRoles jcr:PrimaryType="modeshape:option" modeshape:value="" />
 	              
 	              for read-only acces:
-	              <anonymousUserRoles jcr:PrimaryType="dna:option" dna:value="readonly" /> 
+	              <anonymousUserRoles jcr:PrimaryType="modeshape:option" modeshape:value="readonly" />
 	              -->
-	          </dna:options>
-	      </dna:repository>
-	  </dna:repositories>
+	          </modeshape:options>
+	      </modeshape:repository>
+	  </modeshape:repositories>
     <!-- 
-    Define the sources for the content.  These sources are directly accessible using the DNA-specific 
+    Define the sources for the content.  These sources are directly accessible using the ModeShape-specific 
     Graph API.
     -->
-    <dna:sources jcr:primaryType="nt:unstructured">
-        <dna:source jcr:name="Cars" 
-                    dna:classname="org.jboss.dna.graph.connector.inmemory.InMemoryRepositorySource" 
-                    dna:retryLimit="3" dna:defaultWorkspaceName="workspace1"/>
-        <dna:source jcr:name="Aircraft" 
-                    dna:classname="org.jboss.dna.graph.connector.inmemory.InMemoryRepositorySource">
+    <modeshape:sources jcr:primaryType="nt:unstructured">
+        <modeshape:source jcr:name="Cars"
+                    modeshape:classname="org.modeshape.graph.connector.inmemory.InMemoryRepositorySource"
+                    modeshape:retryLimit="3" modeshape:defaultWorkspaceName="workspace1"/>
+        <modeshape:source jcr:name="Aircraft"
+                    modeshape:classname="org.modeshape.graph.connector.inmemory.InMemoryRepositorySource">
             <!-- Define the name of the workspace used by default.  Optional, but convenient. -->
             <defaultWorkspaceName>workspace2</defaultWorkspaceName>
-        </dna:source>
-    </dna:sources>
+        </modeshape:source>
+    </modeshape:sources>
     <!-- 
     Define the sequencers. This is an optional section. 
     -->
-    <dna:sequencers>
-        <dna:sequencer jcr:name="Image Sequencer" 
-                       dna:classname="org.jboss.dna.sequencer.image.ImageMetadataSequencer">
-            <dna:description>Image metadata sequencer</dna:description>        
-            <dna:pathExpression>/foo/source => /foo/target</dna:pathExpression>
-            <dna:pathExpression>/bar/source => /bar/target</dna:pathExpression>
-        </dna:sequencer>
-    </dna:sequencers>
+    <modeshape:sequencers>
+        <modeshape:sequencer jcr:name="Image Sequencer"
+                       modeshape:classname="org.modeshape.sequencer.image.ImageMetadataSequencer">
+            <modeshape:description>Image metadata sequencer</modeshape:description>
+            <modeshape:pathExpression>/foo/source => /foo/target</modeshape:pathExpression>
+            <modeshape:pathExpression>/bar/source => /bar/target</modeshape:pathExpression>
+        </modeshape:sequencer>
+    </modeshape:sequencers>
     <!--
-	  Define how JBoss DNA will determine the MIME type of files. This is an optional section 
+	  Define how ModeShape will determine the MIME type of files. This is an optional section 
 	  (and the default works pretty well).
     -->
-    <dna:mimeTypeDetectors>
-        <dna:mimeTypeDetector jcr:name="Detector" 
-                              dna:description="Standard extension-based MIME type detector"/>
-    </dna:mimeTypeDetectors>
+    <modeshape:mimeTypeDetectors>
+        <modeshape:mimeTypeDetector jcr:name="Detector"
+                              modeshape:description="Standard extension-based MIME type detector"/>
+    </modeshape:mimeTypeDetectors>
 </configuration>]]></programlisting>
 		</sect2>
 		<sect2 id="loading_from_repository">
 			<title>Loading from a configuration repository</title>
 			<para>
-				Loading the JBoss DNA configuration from an existing repository is also pretty straightforward.  Simply create and configure the
+				Loading the ModeShape configuration from an existing repository is also pretty straightforward.  Simply create and configure the
 				&RepositorySource; instance to point to the desired repository, and then call the <code>loadFrom(&RepositorySource; source)</code>
 				method:
 			</para>
@@ -289,10 +289,10 @@
       .addNodeTypes("myCustomNodeTypes.cnd")
       .setSource("source 1")
       .registerNamespace("acme","http://www.example.com/acme")
-      .setOption(JcrRepository.Option.JAAS_LOGIN_CONFIG_NAME, "dna-jcr");
+      .setOption(JcrRepository.Option.JAAS_LOGIN_CONFIG_NAME, "modeshape-jcr");
       
       /*
-       * As a convenience, DNA allows guest users full access by default.  In a production system,
+       * As a convenience, ModeShape allows guest users full access by default.  In a production system,
        * you would want to limit this access by adding one of the lines below to modify this option:
        * .setOption(JcrRepository.Option.ANONYMOUS_USER_ROLES, ""); // No access
        * .setOption(JcrRepository.Option.ANONYMOUS_USER_ROLES, "readonly"); // Read-only access
@@ -302,7 +302,7 @@
 					a database store, or any other source).  Additionally, this example adds the node types in the "myCustomNodeTypes.cnd" file as those
 					that will be made available when the repository is accessed.  It also defines the "http://www.example.com/acme" namespace,
 					and finally sets the "JAAS_LOGIN_CONFIG_NAME" option to define the name	of the JAAS login configuration that should be used by 
-					the JBoss DNA repository.
+					the ModeShape repository.
 				</para>
 				<note>
 					<para>Each time <code>repository(String)</code> is called, it will either load the existing definition with the supplied
@@ -319,7 +319,7 @@
 					of the input path expression).</para> 
     		<programlisting role="JAVA"><![CDATA[JcrConfiguration config = ...
 config.sequencer("Image Sequencer")
-      .usingClass("org.jboss.dna.sequencer.image.ImageMetadataSequencer")
+      .usingClass("org.modeshape.sequencer.image.ImageMetadataSequencer")
       .loadedFromClasspath()
       .setDescription("Sequences image files to extract the characteristics of the image")
       .sequencingFrom("//(*.(jpg|jpeg|gif|bmp|pcx|png|iff|ras|pbm|pgm|ppm|psd)[*])/jcr:content[@jcr:data]")
@@ -348,7 +348,7 @@
 					other bean properties required by the implementation.</para> 
     		<programlisting role="JAVA"><![CDATA[JcrConfiguration config = ...
 config.mimeTypeDetector("Extension Detector")
-      .usingClass(org.jboss.dna.graph.mimetype.ExtensionBasedMimeTypeDetector.class);]]></programlisting>
+      .usingClass(org.modeshape.graph.mimetype.ExtensionBasedMimeTypeDetector.class);]]></programlisting>
 				<para>
 					Of course, the class can be specified as Class reference or a string (followed by whether the class should be loaded from
 					the classpath or from a specific classpath).
@@ -363,19 +363,19 @@
 			</sect3>
 		</sect2>
 	</sect1>
-	<sect1 id="dna_and_jndi">
-		<title>Deploying JBoss DNA via JNDI</title>
+	<sect1 id="modeshape_and_jndi">
+		<title>Deploying ModeShape via JNDI</title>
 		<para>
 			Sometimes your applications can simply define a &JcrConfiguration; and instantiate the &JcrEngine; instance directly.
-			This is very straightforward, and this is what the <link linkend="downloading_and_running">JBoss DNA examples</link> do.
+			This is very straightforward, and this is what the <link linkend="downloading_and_running">ModeShape examples</link> do.
 		</para>
 		<para>
 			Web applications are a different story. Often, you may not want your web application to contain the code that initializes
-			a JBoss DNA engine.  Or, you may want the same &JcrEngine; instance to be reused in multiple web applications deployed 
+			a ModeShape engine.  Or, you may want the same &JcrEngine; instance to be reused in multiple web applications deployed 
 			to the same web/application server. In these cases, it is possible to configure the web/app server's JNDI instance to
 			instantiate the &JcrEngine;, meaning the web applications need only use the standard JNDI and JCR APIs.
 		</para>
-		<sect2 id="dna_and_jndi_application">
+		<sect2 id="modeshape_and_jndi_application">
 			<title>Example application using JCR and JNDI</title>
 			<para>
 				Here's an example of how such a web application would obtain a JCR &Repository; instance, use it to create a &JcrSession;,
@@ -409,11 +409,11 @@
 				the web server so that the &Repository; instance is available in JNDI.
 			</para>
 		</sect2>
-		<sect2 id="dna_and_jndi_configuring">
+		<sect2 id="modeshape_and_jndi_configuring">
 			<title>Configuring JCR and JNDI</title>
 			<para>
 				Each kind of web server or application server is different, but all servlet containers do provide a way of configuring
-				objects and placing them into JNDI.  JBoss DNA provides a &JndiRepositoryFactory; class that implements &ObjectFactory;
+				objects and placing them into JNDI.  ModeShape provides a &JndiRepositoryFactory; class that implements &ObjectFactory;
 				and that can be used in the server's configuration. The &JndiRepositoryFactory; requires two properties:
 				<itemizedlist>
 					<listitem>
@@ -436,7 +436,7 @@
 <programlisting role="XML"><![CDATA[<Resource name="jcr/local" 
           auth="Container"
           type="javax.jcr.Repository"
-          factory="org.jboss.dna.jcr.JndiRepositoryFactory"
+          factory="org.modeshape.jcr.JndiRepositoryFactory"
           configFile="/resource/path/to/configuration.xml"
           repositoryName="Test Repository Source" />]]></programlisting>
 			<para>
@@ -444,13 +444,13 @@
 				that only one &JcrEngine; is instantiated, but that a &Repository; instance is registered for each entry.
 			</para>
 			<para>
-				Before the server can start, however, all of the JBoss DNA jars need to be placed on the classpath for the server.
+				Before the server can start, however, all of the ModeShape jars need to be placed on the classpath for the server.
 				JAAS also needs to be configured, and this can be done using the application server's configuration or in your
 				web application if you're using a simple servlet container. For more details, see the &ReferenceGuide;.
 			</para>
 			<note>
 				<para>
-					The JBoss DNA community has solicited input on how we can make it easier to consume and use JBoss DNA in applications
+					The ModeShape community has solicited input on how we can make it easier to consume and use ModeShape in applications
 					that do not use Maven. Check out the <ulink url="http://community.jboss.org/thread/146589">discussion thread</ulink>,
 					and please add any suggestions or opinions!
 				</para>
@@ -517,54 +517,54 @@
 			</note>
 		</sect2>
 	</sect1>
-	<sect1 id="using_dna_via_maven">
-		<title>Using JBoss DNA via Maven</title>
+	<sect1 id="using_modeshape_via_maven">
+		<title>Using ModeShape via Maven</title>
 		<para>
-			JBoss DNA is a Maven-based project. If your application is using Maven, it is very easy to add a dependency on 
-			JBoss DNA's JCR library (plus any extensions), and Maven will ensure your application has access to all 
-			of the JBoss DNA artifacts and all 3rd-party libraries upon which DNA depends. 
+			ModeShape is a Maven-based project. If your application is using Maven, it is very easy to add a dependency on 
+			ModeShape's JCR library (plus any extensions), and Maven will ensure your application has access to all 
+			of the ModeShape artifacts and all 3rd-party libraries upon which ModeShape depends. 
 			Simply add a dependency in your application's POM:
 		</para>
 <programlisting role="XML"><![CDATA[<dependency>
-  <groupId>org.jboss.dna</groupId>
-  <artifactId>dna-jcr</artifactId>
-  <version>0.7</version>
+  <groupId>org.modeshape</groupId>
+  <artifactId>modeshape-jcr</artifactId>
+  <version>1.0.0.Beta1</version>
 </dependency>
 ]]></programlisting>
 			<para>
 				plus dependencies for each optional extension (sequencers, connectors, MIME type detectors, etc.):
 			</para>
 <programlisting role="XML"><![CDATA[<dependency>
-  <groupId>org.jboss.dna</groupId>
-  <artifactId>dna-connector-store-jpa</artifactId>
-  <version>0.7</version>
+  <groupId>org.modeshape</groupId>
+  <artifactId>modeshape-connector-store-jpa</artifactId>
+  <version>1.0.0.Beta1</version>
 </dependency>
 ...
 <dependency>
-  <groupId>org.jboss.dna</groupId>
-  <artifactId>dna-sequencer-java</artifactId>
-  <version>0.7</version>
+  <groupId>org.modeshape</groupId>
+  <artifactId>modeshape-sequencer-java</artifactId>
+  <version>1.0.0.Beta1</version>
 </dependency>
 ]]></programlisting>
 		<para>
 			Then, continue by defining a &JcrConfiguration; and building the engine, as discussed <link linkend="jcr-engine">earlier</link>.
-			This is very straightforward, and this is exactly what the <link linkend="downloading_and_running">JBoss DNA examples</link> do.
+			This is very straightforward, and this is exactly what the <link linkend="downloading_and_running">ModeShape examples</link> do.
 		</para>
 		<note>
 			<para>
-				The JBoss DNA community has solicited input on how we can make it easier to consume and use JBoss DNA in applications
+				The ModeShape community has solicited input on how we can make it easier to consume and use ModeShape in applications
 				that do not use Maven. Check out the <ulink url="http://community.jboss.org/thread/146589">discussion thread</ulink>,
 				and please add any suggestions or opinions!
 			</para>
 		</note>
 	</sect1>
-	<sect1 id="using_dna_whats_next">
+	<sect1 id="using_modeshape_whats_next">
 		<title>What's next</title>
 		<para>
-			This chapter outline how you configure JBoss DNA, how you then access a <code>javax.jcr.Repository</code> instance,
+			This chapter outline how you configure ModeShape, how you then access a <code>javax.jcr.Repository</code> instance,
 			and use the standard JCR API to interact with the repository. The
 			<link linkend="downloading_and_running">next chapter </link> walks you through downloading
-			and running the JBoss DNA examples. 
+			and running the ModeShape examples. 
 		</para>
 	</sect1>
 </chapter>
Index: docs/gettingstarted/src/main/docbook/en-US/content/repository_example.xml
===================================================================
--- docs/gettingstarted/src/main/docbook/en-US/content/repository_example.xml	(revision 1584)
+++ docs/gettingstarted/src/main/docbook/en-US/content/repository_example.xml	Thu Jan 14 09:22:32 CET 2010
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
-  ~ JBoss DNA (http://www.jboss.org/dna)
+  ~ ModeShape (http://www.modeshape.org)
   ~
   ~ See the COPYRIGHT.txt file distributed with this work for information
   ~ regarding copyright ownership.  Some portions may be licensed
@@ -8,12 +8,12 @@
   ~ See the AUTHORS.txt file in the distribution for a full listing of 
   ~ individual contributors.
   ~
-  ~ JBoss DNA is free software. Unless otherwise indicated, all code in JBoss DNA
+  ~ ModeShape is free software. Unless otherwise indicated, all code in ModeShape
   ~ is licensed to you under the terms of the GNU Lesser General Public License as
   ~ published by the Free Software Foundation; either version 2.1 of
   ~ the License, or (at your option) any later version.
   ~
-  ~ JBoss DNA is distributed in the hope that it will be useful,
+  ~ ModeShape is distributed in the hope that it will be useful,
   ~ but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
   ~ or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License
   ~ for more details.
@@ -38,7 +38,7 @@
 	</para>
 	<sect1 id="running_repository_example">
 		<title>Running the repository example</title>
-		<para>The repository example consists of a client application that sets up three DNA repositories (named "Cars", "Airplanes", and "UFOs") and 
+		<para>The repository example consists of a client application that sets up three ModeShape repositories (named "Cars", "Airplanes", and "UFOs") and 
 			a federated repository ("Vehicles") that dynamically federates the information from the other three repositories.
 			The client application allows you to interactively navigate each of these repositories just as you would navigate the
 			directory structure on a file system.</para>
@@ -57,7 +57,7 @@
 			</figure>
 	  </para>
 		<para>
-      To run the client application, go to the <code>examples/repository/target/dna-example-repositories-basic.dir/</code>
+      To run the client application, go to the <code>examples/repository/target/modeshape-example-repositories-basic.dir/</code>
       directory and type <code>./run.sh</code>. You should see the command-line client and its menus in your terminal:
       <figure id="example-repositories-client">
 				<title>Example Client</title>
@@ -89,10 +89,10 @@
 			</table>
 			<note>
 				<para>
-					The first time you access any repository, the application is automatically logging you in to DNA's JAAS-based security
+					The first time you access any repository, the application is automatically logging you in to ModeShape's JAAS-based security
 					system.  To make the application easier to use, it always logs in with the "jsmith" as the username and "secret" as the
 					password.  This matches what is configured in the "jaas.conf.xml" and "users.properties" files.  If you want to confirm
-					that the security feature is working, change the password in target/dna-example-repositories-basic.dir/users.properties to
+					that the security feature is working, change the password in target/modeshape-example-repositories-basic.dir/users.properties to
 					something else and re-run the application.  After you select a repository and try to view a directory with 'ls', you
 					will get a LoginException!
 				</para>
@@ -106,23 +106,23 @@
 			<para>You can also choose to navigate the "Vehicles" repository, which projects the "Cars" repository content under the
 				<code>/Vehicles/Cars</code> node, the "Airplanes" content under the <code>/Vehicles/Airplanes</code> branch,
 				the "UFOs" content under the <code>/Vehicles/UFOs</code> branch,
-				and the "Configuration" content under <code>/dna:system</code>.
+				and the "Configuration" content under <code>/modeshape:system</code>.
 			</para>
 			<para>Try using the client to walk the different repositories.  And while this is a contrived application, it does demonstrate
-				the use of JBoss DNA to federate repositories and provide access through JCR.</para>
+				the use of ModeShape to federate repositories and provide access through JCR.</para>
   </sect1>
 	<sect1 id="connectors">
-		<title>JBoss DNA connectors</title>
-		<para>As mentioned in the <link linkend="introduction">Introduction</link>, one of the capabilities of JBoss DNA is to provide access through 
+		<title>ModeShape connectors</title>
+		<para>As mentioned in the <link linkend="introduction">Introduction</link>, one of the capabilities of ModeShape is to provide access through 
 			<ulink url="http://www.jcp.org/en/jsr/detail?id=170">JCR</ulink> to different kinds of repositories and storage systems.
-			Your applications work with the JCR API, but through JBoss DNA you're able to accesses the content from where the information
-			exists - not just a single purpose-built repository.  This is fundamentally what makes JBoss DNA different.</para>
-		<para>How does JBoss DNA do this?  At the heart of JBoss DNA and it's JCR implementation is a simple connector
-			system that is designed around creating and accessing graphs.  The JBoss DNA JCR implementation actually just sits on
+			Your applications work with the JCR API, but through ModeShape you're able to accesses the content from where the information
+			exists - not just a single purpose-built repository.  This is fundamentally what makes ModeShape different.</para>
+		<para>How does ModeShape do this?  At the heart of ModeShape and it's JCR implementation is a simple connector
+			system that is designed around creating and accessing graphs.  The ModeShape JCR implementation actually just sits on
 			top of a single repository source, which it uses to access of the repositories content.
-			<figure id="dnajcr-and-connector">
-				<title>JBoss DNA's JCR implementation delegates to a repository connector</title>
-				<graphic align="center" scale="100" fileref="dnajcr-and-connector.png"/>
+			<figure id="modeshapejcr-and-connector">
+				<title>ModeShape's JCR implementation delegates to a repository connector</title>
+				<graphic align="center" scale="100" fileref="modeshapejcr-and-connector.png"/>
 			</figure>
 			That single repository connector could access:
 		</para>
@@ -153,16 +153,16 @@
 			</listitem>
 		</itemizedlist>
 		<para>
-			<figure id="dna-connectors">
-				<title>JBoss DNA can put JCR on top of multiple kinds of systems</title>
-				<graphic align="center" scale="100" fileref="dna-connectors.png"/>
+			<figure id="modeshape-connectors">
+				<title>ModeShape can put JCR on top of multiple kinds of systems</title>
+				<graphic align="center" scale="100" fileref="modeshape-connectors.png"/>
 			</figure>
-	  	And the JBoss DNA project has plans to create other connectors, too.  For instance, we're going to build a connector 
+	  	And the ModeShape project has plans to create other connectors, too.  For instance, we're going to build a connector 
 	    to other JCR repositories.  And another to access existing databases so that some or all of the existing data (in whatever structure)
 	    can be accessed through JCR.  Of course, if we don't have a connector to suit your needs, you can write your own.
-			<figure id="dna-connectors-future">
-				<title>Future JBoss DNA connectors</title>
-				<graphic align="center" scale="100" fileref="dna-connectors-future.png"/>
+			<figure id="modeshape-connectors-future">
+				<title>Future ModeShape connectors</title>
+				<graphic align="center" scale="100" fileref="modeshape-connectors-future.png"/>
 			</figure>
 		</para>
 		<note>
@@ -171,9 +171,9 @@
 			  are already mechanisms to do that?</para>
 		  <para>Maybe putting JCR on top of a single system (like a JDBC database) isn't that interesting. What
 			  <emphasis>is</emphasis> interesting, though, is accessing the information in multiple systems <emphasis>as if all that information were
-			  in a single JCR repository</emphasis>.  That's what the federated repository source is all about.  The JBoss DNA connector
+			  in a single JCR repository</emphasis>.  That's what the federated repository source is all about.  The ModeShape connector
 				system just makes it possible to interact with all these systems in the same way.</para>
-			<para>Think of it this way: with JBoss DNA, you can use JCR to get to the schemas of multiple relational databases <emphasis>and</emphasis> the schemas
+			<para>Think of it this way: with ModeShape, you can use JCR to get to the schemas of multiple relational databases <emphasis>and</emphasis> the schemas
 			  defined by DDL files in your SVN repository <emphasis>and</emphasis> the schemas defined by logical models stored on your file system.
 			</para>
 		</note>
@@ -185,18 +185,18 @@
 					contains implementations of several interfaces (described below).  A Java developer <emphasis>writes</emphasis>
 					a connector to a type of source, such as a particular database management system, LDAP directory, source code
 					management system, etc.  It is then packaged into one or more JAR files (including dependent JARs) and deployed
-					for use in applications that use JBoss DNA repositories.
+					for use in applications that use ModeShape repositories.
 				</para>
 			</listitem>
 			<listitem>
 				<para>
 					The description of a particular source system (e.g., the "Customer" database, or the company LDAP system) 
-					is called a <emphasis role="strong">repository source</emphasis>.  JBoss DNA defines a &RepositorySource; interface
+					is called a <emphasis role="strong">repository source</emphasis>.  ModeShape defines a &RepositorySource; interface
 					that defines methods describing the behavior and supported features and a method for establishing connections.
 					A connector will have a class that implements this interface and that has JavaBean properties for
 					all of the connector-specific properties required to fully describe an instance of the system.  Use of JavaBean
 					properties is not required, but it is highly recommended, as it enables reflective configuration and administration.
-					Applications that use JBoss DNA create an instance of the connector's &RepositorySource; implementation and set 
+					Applications that use ModeShape create an instance of the connector's &RepositorySource; implementation and set 
 					the properties for the external source that the application wants to access with that connector.
 				</para>
 			</listitem>
@@ -215,7 +215,7 @@
 				</para>
 			</listitem>
 		</itemizedlist>
-		<para>As an example, consider that we want JBoss DNA to give us access through JCR to the schema information contained in a
+		<para>As an example, consider that we want ModeShape to give us access through JCR to the schema information contained in a
 			relational database.  We first have to develop a connector that allows us to interact with relational databases using JDBC.
 			That connector would contain a &JdbcMetadataSource; Java class that implements &RepositorySource;,
 			and that has all of the various JavaBean properties for setting the name of the driver class, URL, username, password,
@@ -225,9 +225,9 @@
 		<note>
 			<para>
 				Of course, before you develop a connector, you should probably check the
-				<ulink url="http://docs.jboss.org/jbossdna/latest/manuals/reference/html/provied-connectors-part.html">list of connectors</ulink> JBoss DNA already provides out of the box.
-				With this latest release, JBoss DNA already includes this JDBC metadata connector!  And we're always interested in new
-				connectors and new contributors, so please consider developing your custom connector as part of JBoss DNA.
+				<ulink url="http://docs.jboss.org/modeshape/latest/manuals/reference/html/provied-connectors-part.html">list of connectors</ulink> ModeShape already provides out of the box.
+				With this latest release, ModeShape already includes this JDBC metadata connector!  And we're always interested in new
+				connectors and new contributors, so please consider developing your custom connector as part of ModeShape.
 			</para>
 		</note>
 		<para>So with this very high-level summary, let's dive a little deeper and look at the repository example.</para>
@@ -241,7 +241,7 @@
 		<para>
       The example is comprised of 2 classes and 1 interface, located in the <code>src/main/java</code> directory:</para>
     <programlisting><![CDATA[
-  org/jboss/example/dna/repositories/ConsoleInput.java
+  org/modeshape/example/repositories/ConsoleInput.java
                                     /RepositoryClient.java
                                     /UserInterface.java
   ]]></programlisting>
@@ -254,7 +254,7 @@
 			implementation for testing purposes that simulates a user entering data. This allows us to check the behavior of the client 
 			automatically using conventional JUnit test cases, as demonstrated by the code in the <code>src/test/java</code> directory:</para>
     <programlisting><![CDATA[
-  org/jboss/example/dna/sequencers/RepositoryClientTest.java
+  org/modeshape/example/sequencers/RepositoryClientTest.java
                                   /RepositoryClientUsingJcrTest.java
   ]]></programlisting>
 	<para>If we look at the <code>RepositoryClient</code> code, there are a handful of methods that encapsulate the various activities.</para>
@@ -263,10 +263,10 @@
 			the code is more readable and concise.</para>
 	</note>
 	<para>The <code>main(String[] argv)</code> method is of course the method that is executed when the application is run.  This code
-	  creates the JBoss DNA configuration by loading it from a file.
+	  creates the ModeShape configuration by loading it from a file.
 	</para>
 	<programlisting role="JAVA"><![CDATA[
-// Set up the JAAS provider (IDTrust) and a policy file (which defines the "dna-jcr" login config name)
+// Set up the JAAS provider (IDTrust) and a policy file (which defines the "modeshape-jcr" login config name)
 IDTrustConfiguration idtrustConfig = new IDTrustConfiguration();
 try {
     idtrustConfig.config("security/jaas.conf.xml");
@@ -279,7 +279,7 @@
 for (String arg : args) {
     arg = arg.trim();
     if (arg.equals("--api=jcr")) client.setApi(Api.JCR);
-    if (arg.equals("--api=dna")) client.setApi(Api.DNA);
+    if (arg.equals("--api=modeshape")) client.setApi(Api.ModeShape);
     if (arg.equals("--jaas")) client.setJaasContextName(JAAS_LOGIN_CONTEXT_NAME);
     if (arg.startsWith("--jaas=") && arg.length() > 7) client.setJaasContextName(arg.substring(7).trim());
 }
@@ -287,7 +287,7 @@
 client.setUserInterface(new ConsoleInput(client, args));
  ]]></programlisting>
 	<para>
-		The first block sets up the JAAS provider to be the IDTrust library and a policy file that defines the "dna-jcr" JAAS configuration.
+		The first block sets up the JAAS provider to be the IDTrust library and a policy file that defines the "modeshape-jcr" JAAS configuration.
 	</para>
 	<para>
 		The second block of code instantiates the <code>RepositoryClient</code> and passes in some options determined from the command-line.
@@ -336,7 +336,7 @@
  ]]></programlisting>
 		<para>
 			This method does a number of different things.  First, it checks to make sure the repositories are not already running; if so
-			the method just returns.  Then, it creates a JBoss DNA <code>JcrConfiguration</code> instance and loads the configuration
+			the method just returns.  Then, it creates a ModeShape <code>JcrConfiguration</code> instance and loads the configuration
 			from a file provided by the user interface.  The method then loads the node types for each of the repositories; this could
 			have been done in the configuration, but it would have made the configuration file larger and more difficult to understand.
 			It then creates the <code>JcrEngine</code> from the configuration and starts it.  Finally, it obtains the location of the
@@ -366,15 +366,15 @@
 			When needed, the client will authenticate the user (by asking the user interface for a callback handler that will be called
 			when the authentication information is needed).  The resulting authenticated <code>LoginContext</code> is wrapped
 			by a custom <code>javax.jcr.Credentials</code> implementation.  As long as the <code>Credentials</code> implementation
-			has a <code>getLoginContext()</code> method that returns a <code>LoginContext</code> object, JBoss DNA's repository
+			has a <code>getLoginContext()</code> method that returns a <code>LoginContext</code> object, ModeShape's repository
 			implementation will use that context to create the <code>javax.jcr.Session</code>.  (Of course, the <code>javax.jcr.SimpleCredentials</code>
-			can also be used to create a Session, and JBoss DNA will then attempt to use JAAS to authenticate the user given by the credentials.)
+			can also be used to create a Session, and ModeShape will then attempt to use JAAS to authenticate the user given by the credentials.)
 		</para>
 		<para>
 			The <code>getNodeInfo(...)</code> method of the example is what is called when the properties and children of a particular node
 			are requested by the user interface.  (In the console user interface, this happens when the user navigates the graph structure.)
 			There are really two different behaviors to this method, depending upon whether the JCR API is to be used or whether
-			the JBoss DNA Graph API is to be used.  The portion that uses JCR is shown below:
+			the ModeShape Graph API is to be used.  The portion that uses JCR is shown below:
 	   </para>
 		<programlisting role="JAVA"><![CDATA[
 JcrRepository jcrRepository = engine.getRepository(sourceName);
@@ -444,7 +444,7 @@
 			finally logs out of the session.
 		</para>
 		<para>
-			The JBoss DNA Graph API is actually an internal API used within the different components of JBoss DNA
+			The ModeShape Graph API is actually an internal API used within the different components of ModeShape
 			(including the connector and sequencer frameworks),	and provides low-level access to the exact same content.
 			Though we do not recommend using this API in your client applications, if you need to write a connector
 			or sequencer, you may need to know how to use the Graph API.  
@@ -452,11 +452,11 @@
 			shown above:
 		</para>
 		<programlisting role="JAVA"><![CDATA[
-// Use the DNA Graph API to read the properties and children of the node ...
+// Use the ModeShape Graph API to read the properties and children of the node ...
 ExecutionContext context = loginContext != null ? this.context.create(loginContext) : this.context;
 Graph graph = engine.getGraph(context, sourceName);
 graph.useWorkspace("default");
-org.jboss.dna.graph.Node node = graph.getNodeAt(pathToNode);
+org.modeshape.graph.Node node = graph.getNodeAt(pathToNode);
 
 if (properties != null) {
     // Now copy the properties into the map provided as a method parameter ...
@@ -478,7 +478,7 @@
 			This is in part because the Graph API doesn't have the notion of a stateful session.  But some of it also is simply
 			because the Graph API design requires less code to do the same kinds of operations.
 		</para>
-		<para>None of the other methods in the <code>RepositoryClient</code> really do anything with JBoss DNA or JCR 
+		<para>None of the other methods in the <code>RepositoryClient</code> really do anything with ModeShape or JCR 
 		  <emphasis>per se</emphasis>. Instead, they really facilitate interaction with the user interface.
 		</para>
 		<para>If we look at the <code>ConsoleInput</code> constructor, it starts the repository and a thread 
@@ -516,7 +516,7 @@
   }
 }
   ]]></programlisting>
-		<para>At this point, we've reviewed all of the interesting code in the example application related to JBoss DNA.  However, feel free
+		<para>At this point, we've reviewed all of the interesting code in the example application related to ModeShape.  However, feel free
     to play with the application, trying different things.
     </para>
 	</sect1>
@@ -528,8 +528,8 @@
 			This was a very simplistic example that only took a few minutes to run.
 		</para>
 		<para>
-			In the <link linkend="conclusion">next chapter</link> we'll wrap up by summarizing what we've learned about JBoss DNA
-			and provide information about where you can find out more about JBoss DNA.
+			In the <link linkend="conclusion">next chapter</link> we'll wrap up by summarizing what we've learned about ModeShape
+			and provide information about where you can find out more about ModeShape.
 		</para>
 	</sect1>
 </chapter>
Index: docs/gettingstarted/src/main/docbook/en-US/content/preface.xml
===================================================================
--- docs/gettingstarted/src/main/docbook/en-US/content/preface.xml	(revision 1570)
+++ docs/gettingstarted/src/main/docbook/en-US/content/preface.xml	Thu Jan 14 09:29:26 CET 2010
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
-  ~ JBoss DNA (http://www.jboss.org/dna)
+  ~ ModeShape (http://www.modeshape.org)
   ~
   ~ See the COPYRIGHT.txt file distributed with this work for information
   ~ regarding copyright ownership.  Some portions may be licensed
@@ -8,12 +8,12 @@
   ~ See the AUTHORS.txt file in the distribution for a full listing of 
   ~ individual contributors.
   ~
-  ~ JBoss DNA is free software. Unless otherwise indicated, all code in JBoss DNA
+  ~ ModeShape is free software. Unless otherwise indicated, all code in ModeShape
   ~ is licensed to you under the terms of the GNU Lesser General Public License as
   ~ published by the Free Software Foundation; either version 2.1 of
   ~ the License, or (at your option) any later version.
   ~
-  ~ JBoss DNA is distributed in the hope that it will be useful,
+  ~ ModeShape is distributed in the hope that it will be useful,
   ~ but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
   ~ or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License
   ~ for more details.
@@ -30,26 +30,26 @@
 ]>
 <preface id="preface" revision="1">
   <title>What this book covers</title>
-  <para>The goal of this book is to help you learn about JBoss DNA and how you can use it in your own applications to get the
+  <para>The goal of this book is to help you learn about ModeShape and how you can use it in your own applications to get the
     most out of your JCR repositories.</para>
   <para>The first part of the book starts out with an introduction to content repositories and an overview of the JCR API,
-    both of which are important aspects of JBoss DNA. This is followed by an overview of the JBoss DNA project, its
+    both of which are important aspects of ModeShape. This is followed by an overview of the ModeShape project, its
     architecture, and a basic roadmap for what's coming next.</para>
-  <para>The next part of the book covers how to download and build the examples, how to use JBoss DNA with existing
+  <para>The next part of the book covers how to download and build the examples, how to use ModeShape with existing
     repositories, and how to build and use custom sequencers.</para>
   <para>
-    If you have any questions or comments, please feel free to contact JBoss DNA's
-    <ulink url="mailto:dna-users@jboss.org">user mailing list</ulink>,
+    If you have any questions or comments, please feel free to contact ModeShape's
+    <ulink url="mailto:modeshape-users@jboss.org">user mailing list</ulink>,
     use the
-    <ulink url="http://community.jboss.org/community/dna">user forums</ulink>,
-    or chat with the developers in the <ulink url="http://www.jboss.org/dna/chat.html">IRC chat room</ulink>
+    <ulink url="http://community.jboss.org/community/modeshape">user forums</ulink>,
+    or chat with the developers in the <ulink url="http://www.modeshape.org/chat.html">IRC chat room</ulink>
     . If you'd like to get involved on the project, join the
-    <ulink url="http://www.jboss.org/dna/mailinglists.html">mailing lists</ulink>
+    <ulink url="http://www.modeshape.org/mailinglists.html">mailing lists</ulink>
     ,
-    <ulink url="http://www.jboss.org/dna/sourcecode.html">download the code</ulink>
+    <ulink url="http://www.modeshape.org/sourcecode.html">download the code</ulink>
     and get it building, and visit our
-    <ulink url="http://jira.jboss.org/jira/browse/DNA">JIRA issue management system</ulink>
-    . If there's something in particular you're interested in, talk with the community - there may be others interested in the
+    <ulink url="http://jira.jboss.org/jira/browse/MODE">JIRA issue management system</ulink>
+    . If there's something in particular you're interested in, talk with the community - there may be others who are interested in the
     same thing.
   </para>
 </preface>
Index: docs/gettingstarted/src/main/docbook/en-US/content/introduction.xml
===================================================================
--- docs/gettingstarted/src/main/docbook/en-US/content/introduction.xml	(revision 1584)
+++ docs/gettingstarted/src/main/docbook/en-US/content/introduction.xml	Thu Jan 14 09:33:33 CET 2010
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
-  ~ JBoss DNA (http://www.jboss.org/dna)
+  ~ ModeShape (http://www.modeshape.org)
   ~
   ~ See the COPYRIGHT.txt file distributed with this work for information
   ~ regarding copyright ownership.  Some portions may be licensed
@@ -8,12 +8,12 @@
   ~ See the AUTHORS.txt file in the distribution for a full listing of 
   ~ individual contributors.
   ~
-  ~ JBoss DNA is free software. Unless otherwise indicated, all code in JBoss DNA
+  ~ ModeShape is free software. Unless otherwise indicated, all code in ModeShape
   ~ is licensed to you under the terms of the GNU Lesser General Public License as
   ~ published by the Free Software Foundation; either version 2.1 of
   ~ the License, or (at your option) any later version.
   ~
-  ~ JBoss DNA is distributed in the hope that it will be useful,
+  ~ ModeShape is distributed in the hope that it will be useful,
   ~ but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
   ~ or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License
   ~ for more details.
@@ -36,8 +36,8 @@
     application-specific logic, delegating much of the responsibilities for persistence to libraries and frameworks.</para>
   <para>
     Perhaps one of the easiest techniques is to simply store information in
-    <emphasis>files</emphasis>
-    . The Java language makes working with files relatively easy, but Java really doesn't provide many bells and whistles. So
+    <emphasis>files</emphasis>. The Java language makes working with files relatively easy,
+      but Java really doesn't provide many bells and whistles. So
     using files is an easy choice when the information is either not complicated (for example property files), or when users may
     need to read or change the information outside of the application (for example log files or configuration files). But using
     files to persist information becomes more difficult as the information becomes more complex, as the volume of it increases,
@@ -52,13 +52,13 @@
     process to another.  Using serialization for longer-term storage of information is more risky.
   </para>
   <para>
-    One of the more popular and widely-used persistence technologies is the <emphasis>relational database</emphasis>. 
+    One of the more popular and widely used persistence technologies is the <emphasis>relational database</emphasis>. 
 		Relational database management systems have been around for decades and are very capable. The Java Database Connectivity
     (JDBC) API provides a standard interface for connecting to and interacting with relational databases. However, it is a
     low-level API that requires a lot of code to use correctly, and it still doesn't abstract away the DBMS-specific SQL
-    grammar. Also, working with relational data in an object-oriented language can feel somewhat unnatural, so many developers
+    grammar. Also, working with relational data in an object oriented language can feel somewhat unnatural, so many developers
     map this data to classes that fit much more cleanly into their application. The problem is that manually creating this
-    mapping layer requires a lot of repetitive and non-trivial JDBC code.
+    mapping layer requires a lot of repetitive and nontrivial JDBC code.
   </para>
   <para>
     <emphasis>Object-relational mapping</emphasis>
@@ -98,29 +98,29 @@
 		<title>JCR API features</title>
 		<graphic align="center" scale="100" fileref="jcr-features.png"/>
 	</figure>
-	<sect1 id="what_is_jboss_dna">
-		<title>JBoss DNA</title>
+	<sect1 id="what_is_modeshape">
+		<title>ModeShape</title>
 		<para>
 			What makes JCR interesting, however, is that a JCR implementation provides all these features and capabilities regardless
-			of where or how that information is persisted or stored.  <emphasis>This is in fact the main purpose of JBoss DNA:
+			of where or how that information is persisted or stored.  <emphasis>This is in fact the main purpose of ModeShape:
 			provide a JCR implementation that provides access to content stored in many different kinds of systems.</emphasis>
-			A JBoss DNA repository isn't yet another silo of information, but rather it's a JCR view of the information you already have
-			in your environment: files systems, databases, other repositories, services, applications, etc. <emphasis role="strong">JBoss DNA can 
+			A ModeShape repository isn't yet another silo of information, but rather it's a JCR view of the information you already have
+			in your environment: files systems, databases, other repositories, services, applications, etc. <emphasis role="strong">ModeShape can 
 			help you understand the systems and information you already have.</emphasis>
 		</para>
 		<para>
 			Of course when you start providing a unified view of all this information, you start recognizing the need to store more
-			information, including metadata about and relationships between the existing content.  JBoss DNA lets you do this, too.
-			And JBoss DNA even tries to help you discover more about the information you already have, especially the
+			information, including metadata about and relationships between the existing content.  ModeShape lets you do this, too.
+			And ModeShape even tries to help you discover more about the information you already have, especially the
 			information wrapped up in the kinds of files often found in enterprise systems: service definitions, policy files,
 			images, media, documents, presentations, application components, reusable libraries, configuration files,
 			application installations, databases schemas, management scripts, and so on.  As files are loaded into the repository,
-			JBoss DNA can <emphasis>sequence</emphasis> these files to extract from their content meaningful information that
+			ModeShape can <emphasis>sequence</emphasis> these files to extract from their content meaningful information that
 			can be stored in the repository, where your applications can find it by using the standard JCR API to search,
 			access, and use the information.
 		</para>
 		<para>
-			So, JBoss DNA <emphasis>is</emphasis> a JCR implementation that can automatically sequence files loaded into the repository,
+			So, ModeShape <emphasis>is</emphasis> a JCR implementation that can automatically sequence files loaded into the repository,
 			and it can be used as a traditional JCR silo repository.
 			But it <emphasis>can</emphasis> also let your applications use the JCR API to access the content in other systems, and
 			can unify the content from multiple external systems and multiple storage systems to provide a single, federated repository.
@@ -129,18 +129,18 @@
 	<sect1 id="introduction_whats_next">
 		<title>What's next</title>
 		<para>
-			As we'll see in the <link linkend="use_cases">next chapter</link>, the ability of JBoss DNA to 
-			federate, integrate, and sequence information make JBoss DNA a powerful asset and tool.  
-			Then <link linkend="using_dna">Chapter 3</link> will show that once a JBoss DNA repository is set up, applications see
-			JBoss DNA just as another JCR <code>javax.jcr.Repository</code> instance and use the standard JCR API to obtain a <code>javax.jcr.Session</code>
+			As we'll see in the <link linkend="use_cases">next chapter</link>, the ability of ModeShape to 
+			federate, integrate, and sequence information make ModeShape a powerful asset and tool.  
+			Then <link linkend="using_modeshape">Chapter 3</link> will show that once a ModeShape repository is set up, applications see
+			ModeShape just as another JCR <code>javax.jcr.Repository</code> instance and use the standard JCR API to obtain a <code>javax.jcr.Session</code>
 			and work with the content.
 		</para>
 		<para>
 			<link linkend="downloading_and_running">Chapter 4</link> walks you through downloading
-			and building the JBoss DNA examples, while <link linkend="sequencer_example">Chapter 5</link>
+			and building the ModeShape examples, while <link linkend="sequencer_example">Chapter 5</link>
 			and <link linkend="repository_example">Chapter 6</link> will run these very simple examples and walk through their code.  
-			<link linkend="conclusion">Chapter 7</link> wraps things up with a discussion about the future of JBoss DNA
-			and what you can do next to start using JBoss DNA in your own applications.
+			<link linkend="conclusion">Chapter 7</link> wraps things up with a discussion about the future of ModeShape
+			and what you can do next to start using ModeShape in your own applications.
 	  </para>
 	</sect1>
 </chapter>
Index: docs/gettingstarted/pom.xml
===================================================================
--- docs/gettingstarted/pom.xml	(revision 1595)
+++ docs/gettingstarted/pom.xml	Thu Jan 14 09:01:45 CET 2010
@@ -2,12 +2,12 @@
   <modelVersion>4.0.0</modelVersion>
   <!--
     parent> <groupId>org.jboss</groupId> <artifactId>documentation</artifactId> <version>1.0</version> </parent -->
-  <groupId>org.jboss.dna</groupId>
+  <groupId>org.modeshape</groupId>
   <artifactId>getting-started-en</artifactId>
   <version>1.0.0.Beta1-SNAPSHOT</version>
   <packaging>jdocbook</packaging>
-  <name>JBoss DNA Getting Started manual</name>
-  <description>The JBoss DNA Getting Started manual</description>
+  <name>ModeShape Getting Started manual</name>
+  <description>The ModeShape Getting Started manual</description>
   <build>
     <plugins>
       <plugin>
@@ -101,4 +101,4 @@
 			<url>file://${jboss.repository.root}</url>
 		</repository>
 	</distributionManagement>
-</project>
\ No newline at end of file
+</project>
Index: docs/gettingstarted/src/main/docbook/en-US/content/conclusion.xml
===================================================================
--- docs/gettingstarted/src/main/docbook/en-US/content/conclusion.xml	(revision 1570)
+++ docs/gettingstarted/src/main/docbook/en-US/content/conclusion.xml	Thu Jan 14 09:19:37 CET 2010
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
-  ~ JBoss DNA (http://www.jboss.org/dna)
+  ~ ModeShape (http://www.modeshape.org)
   ~
   ~ See the COPYRIGHT.txt file distributed with this work for information
   ~ regarding copyright ownership.  Some portions may be licensed
@@ -8,12 +8,12 @@
   ~ See the AUTHORS.txt file in the distribution for a full listing of 
   ~ individual contributors.
   ~
-  ~ JBoss DNA is free software. Unless otherwise indicated, all code in JBoss DNA
+  ~ ModeShape is free software. Unless otherwise indicated, all code in ModeShape
   ~ is licensed to you under the terms of the GNU Lesser General Public License as
   ~ published by the Free Software Foundation; either version 2.1 of
   ~ the License, or (at your option) any later version.
   ~
-  ~ JBoss DNA is distributed in the hope that it will be useful,
+  ~ ModeShape is distributed in the hope that it will be useful,
   ~ but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
   ~ or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License
   ~ for more details.
@@ -31,33 +31,33 @@
 <chapter id="conclusion">
 	<title>Wrapping Up</title>
 	<para>
-		This document provides a very high-level overview of JBoss DNA, introducing you to some basic concepts 
-		and showing what would be required to use JBoss DNA in your own application.  
-		We saw two simple examples that showed two different aspects of JBoss DNA: the sequencing system
-		and the connector system.  Each of these examples showed how to create a JBoss DNA configuration, how to start up
-		the JBoss DNA engine, and how to then access a <code>javax.jcr.Repository</code> instance, and after that your application
+		This document provides a very high-level overview of ModeShape, introducing you to some basic concepts 
+		and showing what would be required to use ModeShape in your own application.  
+		We saw two simple examples that showed two different aspects of ModeShape: the sequencing system
+		and the connector system.  Each of these examples showed how to create a ModeShape configuration, how to start up
+		the ModeShape engine, and how to then access a <code>javax.jcr.Repository</code> instance, and after that your application
 		just uses the standard JCR API.
 	</para>
 	<para>
-		For a more in-depth description of JBoss DNA and the internal workings, see our &ReferenceGuide;.
+		For a more in-depth description of ModeShape and the internal workings, see our &ReferenceGuide;.
 		This also describes how to write your own custom sequencers or connectors.
-    If you have any questions or comments, please feel free to contact JBoss DNA's
-    <ulink url="mailto:dna-users@jboss.org">user mailing list</ulink>, use our
-    <ulink url="http://community.jboss.org/community/dna">discussion forums</ulink>,
-    or chat with the developers in the <ulink url="http://www.jboss.org/dna/chat.html">IRC chat room</ulink>.
+    If you have any questions or comments, please feel free to contact ModeShape's
+    <ulink url="mailto:modeshape-users@jboss.org">user mailing list</ulink>, use our
+    <ulink url="http://community.jboss.org/community/modeshape">discussion forums</ulink>,
+    or chat with the developers in the <ulink url="http://www.modeshape.org/chat.html">IRC chat room</ulink>.
     If you find a bug or have a suggestion, please let us know or (better yet) create a new issue in the project's
-    <ulink url="http://jira.jboss.org/jira/browse/DNA">JIRA issue management system</ulink>
+    <ulink url="http://jira.jboss.org/jira/browse/MODE">JIRA issue management system</ulink>
     . If there's something in particular you're interested in, talk with the community - there may be others interested in the
     same thing.
 	</para>
 	<sect1 id="future">
 		<title>Future directions</title>
 		<para>
-			What's next for JBoss DNA?  We're very close to passing all of the JCR Technology Compatibility Kit (TCK) Level 1, Level 2
+			What's next for ModeShape?  We're very close to passing all of the JCR Technology Compatibility Kit (TCK) Level 1, Level 2
 			tests, plus the tests for the optional features including observation and locking.  (In fact, there are just a few outstanding
 			bugs that are preventing us from passing all of these test and becoming fully JCR compliant.)  We will soon be implementing
 			versioning, which is the last optional feature of JCR. 
-			We will also be adding support for clustering multiple JBoss DNA engines spread across multiple JVM processes.
+			We will also be adding support for clustering multiple ModeShape engines spread across multiple JVM processes.
 			And each release we continue to introduce more
 			<link linkend="repository-connectors">connectors</link> and <link linkend="sequencers">sequencers</link> to our library.
 			Other items on our long-term roadmap include a web user interface, Seam integration, and integration with even more kinds of
@@ -67,8 +67,8 @@
 	<sect1 id="get_involved">
 		<title>Getting involved</title>
 		<para>
-		  If you're interested in getting involved with the JBoss DNA project, take a look at our 
-		  <ulink url="http://www.jboss.org/dna/community.html">community pages</ulink>, 
+		  If you're interested in getting involved with the ModeShape project, take a look at our 
+		  <ulink url="http://www.modeshape.org/community.html">community pages</ulink>, 
 		  and consider picking up one of the sequencers or connectors on our
 		  <ulink url="&Roadmap;">roadmap</ulink>.
 		  Or, check out <ulink url="&JIRA;">JIRA</ulink>
Index: docs/gettingstarted/src/main/docbook/en-US/content/use_cases.xml
===================================================================
--- docs/gettingstarted/src/main/docbook/en-US/content/use_cases.xml	(revision 1584)
+++ docs/gettingstarted/src/main/docbook/en-US/content/use_cases.xml	Thu Jan 14 09:23:05 CET 2010
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
-  ~ JBoss DNA (http://www.jboss.org/dna)
+  ~ ModeShape (http://www.modeshape.org)
   ~
   ~ See the COPYRIGHT.txt file distributed with this work for information
   ~ regarding copyright ownership.  Some portions may be licensed
@@ -8,12 +8,12 @@
   ~ See the AUTHORS.txt file in the distribution for a full listing of 
   ~ individual contributors.
   ~
-  ~ JBoss DNA is free software. Unless otherwise indicated, all code in JBoss DNA
+  ~ ModeShape is free software. Unless otherwise indicated, all code in ModeShape
   ~ is licensed to you under the terms of the GNU Lesser General Public License as
   ~ published by the Free Software Foundation; either version 2.1 of
   ~ the License, or (at your option) any later version.
   ~
-  ~ JBoss DNA is distributed in the hope that it will be useful,
+  ~ ModeShape is distributed in the hope that it will be useful,
   ~ but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
   ~ or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License
   ~ for more details.
@@ -29,9 +29,9 @@
 %CustomDTD;
 ]>
 <chapter id="use_cases">
-	<title>JBoss DNA Use Cases</title>
-	<para>There are lots of ways to use JBoss DNA in your own applications, but this chapter attempts to show some representative
-		scenarios that take advantage of JBoss DNA's support for the JCR API as well as the federation, integration, and sequencing 
+	<title>ModeShape Use Cases</title>
+	<para>There are lots of ways to use ModeShape in your own applications, but this chapter attempts to show some representative
+		scenarios that take advantage of ModeShape's support for the JCR API as well as the federation, integration, and sequencing 
 		capabilities.
 	</para>
 	<sect1 id="service_repository">
@@ -59,24 +59,24 @@
 		<para>
 			JCR repositories are naturally searchable and queryable, but also can be used to integrate a taxonomy (or folksonomic tags) 
 			with the content, allowing the same content to be presented in different hierarchical classifications. 
-			But JBoss DNA capabilities also offer a great advantage, since any file that is uploaded can be automatically sequenced and processed 
+			But ModeShape capabilities also offer a great advantage, since any file that is uploaded can be automatically sequenced and processed 
 			to extract information that's meaningful and useful but often locked up within the file.  For example, when a WSDL file is uploaded, 
 			the appropriate	sequencer(s) process the file and extract and store in the repository the structured information describing the types, 
 			message structures, operations, port types, bindings, and services found within the WSDL file.
-			When an XML Schema Document is uploaded, JBoss DNA can do the same for the schema's complex and simple types, element and attribute 
-			declarations, model groups, namespaces, imports, includes, annotations, etc.  And JBoss DNA can do the same for the various policy files,
+			When an XML Schema Document is uploaded, ModeShape can do the same for the schema's complex and simple types, element and attribute 
+			declarations, model groups, namespaces, imports, includes, annotations, etc.  And ModeShape can do the same for the various policy files,
 			resource declarations, documentation, presentations, ontologies, etc.
 		</para>
 		<para>
-			Integration with a management system can be done in a similar manner.  A JBoss DNA connector could access the management system
+			Integration with a management system can be done in a similar manner.  A ModeShape connector could access the management system
 			to discover the servers and enable auto-discovery of the services, and "tag" the services' deployments with the lifecycle phase 
-			(dev, test, production, etc.). Plus, JBoss DNA sequencers can automatically process the uploaded artifacts to extract a useful
+			(dev, test, production, etc.). Plus, ModeShape sequencers can automatically process the uploaded artifacts to extract a useful
 			structured representation of their content, and can then store that additional information in the repository. So not only are
 			the original artifacts stored in the repository, but a structured representation of their content is also stored. And all of
 			it can be accessed, navigated, searched, and even updated.
 		</para>
 		<para>
-			By using JBoss DNA, a service repository could manage the wide range of artifacts required in a SOA or web-oriented architecture,
+			By using ModeShape, a service repository could manage the wide range of artifacts required in a SOA or web-oriented architecture,
 			yet be able to present a unified view of all service information.
 		</para>
 	</sect1>
@@ -95,9 +95,9 @@
 			and the databases themselves have the ability to describe their current schemas.
 		</para>
 		<para>
-			Using JBoss DNA, the repository could use a connector to the version control system to expose the scripts, as well as 
+			Using ModeShape, the repository could use a connector to the version control system to expose the scripts, as well as 
 			connectors to the databases to expose (and cache) the current schema of the databases as structured content.  
-			JBoss DNA sequencers can automatically process the uploaded assets and artifacts to extract a useful
+			ModeShape sequencers can automatically process the uploaded assets and artifacts to extract a useful
 			structured representation of their content, and can then store that additional information in the repository.
 			Applications can access, search, navigate, and update all of this metadata about the databases and data services,
 			all through a single JCR repository using a standard JCR API and without having to touch the underlying systems.
@@ -122,16 +122,16 @@
 			effort.
 		</para>
 		<para>
-			An embedded JBoss DNA repository can provide a more formal and flexible configuration system with little effort.  JCR's
+			An embedded ModeShape repository can provide a more formal and flexible configuration system with little effort.  JCR's
 			event system allows the system to be notified when the configuration changes, and versioning can help guarantee the ability
-			to revert back to a previous (valid) configuration.  JBoss DNA connectors can be used to integrate the files on the file system
+			to revert back to a previous (valid) configuration.  ModeShape connectors can be used to integrate the files on the file system
 			into the configuration system, keeping it natural for those wanting to view and change the configuration via the files.
-			JBoss DNA sequencers can even process the configuration files to extract a more structured view of the system.
-			And because JBoss DNA can used with a minimal footprint, it provides the ability to manage and version the configuration
+			ModeShape sequencers can even process the configuration files to extract a more structured view of the system.
+			And because ModeShape can used with a minimal footprint, it provides the ability to manage and version the configuration
 			with little overhead.
 		</para>
 		<para>
-			JBoss DNA can even be used to centralize the configuration definition for a clustered or distributed system.  In this mode,
+			ModeShape can even be used to centralize the configuration definition for a clustered or distributed system.  In this mode,
 			the configuration is managed in a central repository that is remotely accessible by the application.  When a process is started,
 			it examines the repository and reads the content containing its configuration.  The application can monitor the configuration for
 			changes so that it can modify itself and its components.  
@@ -139,20 +139,20 @@
 			and can even be managed and manipulated through JCR.
 		</para>
 		<para>
-			As we'll see in the <link linkend="using_dna">next chapter</link>, this is actually the way in which JBoss DNA manages
+			As we'll see in the <link linkend="using_modeshape">next chapter</link>, this is actually the way in which ModeShape manages
 			its own configuration.  In the embedded case, the configuration repository is simply a local (in-memory) repository that
 			is populated by the configuration file (or programmatic API).  In a clustered mode, the repository is centralized.  But either
-			way, to JBoss DNA the configuration is always defined in a repository.
+			way, to ModeShape the configuration is always defined in a repository.
 		</para>
 	</sect1>
 	<sect1 id="use_case_whats_next">
 		<title>What's next</title>
 		<para>
-			The scenarios described in this chapter are representative of some of the ways in which JBoss DNA can be used, and hopefully
-			give you ideas about how you can leverage JBoss DNA in your application or library.
+			The scenarios described in this chapter are representative of some of the ways in which ModeShape can be used, and hopefully
+			give you ideas about how you can leverage ModeShape in your application or library.
 		</para>
 		<para>
-			In the <link linkend="using_dna">next chapter</link>, we'll show how you can set up JBoss DNA and use it via the standard JCR API.
+			In the <link linkend="using_modeshape">next chapter</link>, we'll show how you can set up ModeShape and use it via the standard JCR API.
 		</para>
 	</sect1>
 </chapter>
Index: docs/gettingstarted/src/main/docbook/en-US/custom.dtd
===================================================================
--- docs/gettingstarted/src/main/docbook/en-US/custom.dtd	(revision 1584)
+++ docs/gettingstarted/src/main/docbook/en-US/custom.dtd	Thu Jan 14 09:18:11 CET 2010
@@ -1,24 +1,24 @@
-<!ENTITY versionNumber "0.7">
+<!ENTITY versionNumber "1.0.0.Beta1">
 <!ENTITY copyrightYears "2008-2010">
 <!ENTITY copyrightHolder "Red Hat, Inc.">
 
 <!-- Frequently used URLs -->
 
-<!ENTITY Home       					"http://www.jboss.org/dna/">
+<!ENTITY Home       					"http://www.modeshape.org/">
 <!ENTITY Downloads  					"&Home;downloads.html">
 <!ENTITY Community  					"&Home;community.html">
-<!ENTITY DocHome    					"http://docs.jboss.org/jbossdna">
-<!ENTITY API        					"&DocHome;/&versionNumber;/api/org/jboss/dna/">
-<!ENTITY JIRA       					"http://jira.jboss.org/jira/browse/DNA">
+<!ENTITY DocHome    					"http://docs.jboss.org/modeshape">
+<!ENTITY API        					"&DocHome;/&versionNumber;/api/org/modeshape/">
+<!ENTITY JIRA       					"http://jira.jboss.org/jira/browse/MODE">
 <!ENTITY Roadmap       				"&JIRA;?report=com.atlassian.jira.plugin.system.project:roadmap-panel">
-<!ENTITY Subversion  					"http://anonsvn.jboss.org/repos/dna/">
-<!ENTITY Fisheye							"http://fisheye.jboss.org/browse/DNA/">
-<!ENTITY SecureSubversion  		"https://svn.jboss.org/repos/dna/">
-<!ENTITY Forums     					"http://community.jboss.org/en/dna">
+<!ENTITY Subversion  					"http://anonsvn.jboss.org/repos/modeshape/">
+<!ENTITY Fisheye							"http://fisheye.jboss.org/browse/MODE/">
+<!ENTITY SecureSubversion  		"https://svn.jboss.org/repos/modeshape/">
+<!ENTITY Forums     					"http://community.jboss.org/en/modeshape">
 <!ENTITY JSR170  							"http://www.jcp.org/en/jsr/detail?id=170">
 <!ENTITY JSR283  							"http://www.jcp.org/en/jsr/detail?id=283">
 <!ENTITY JSR203  							"http://www.jcp.org/en/jsr/detail?id=203">
-<!ENTITY MailTo     					"mailto:dna-users@jboss.org">
+<!ENTITY MailTo     					"mailto:modeshape-users@jboss.org">
 <!ENTITY Wikipedia						"http://en.wikipedia.org/wiki/">
 <!ENTITY JBossMaven						"http://repository.jboss.com/maven2/">
 
@@ -53,13 +53,13 @@
 <!ENTITY Credentials					       	"<interface>Credentials</interface>">
 <!ENTITY SimpleCredentials					  "<interface>SimpleCredentials</interface>">
 
-<!-- Types in dna-common -->
+<!-- Types in modeshape-common -->
 
 <!ENTITY Logger							       		"<ulink url='&API;common/util/Logger.html'><interface>Logger</interface></ulink>">
 <!ENTITY ClassLoaderFactory       		"<ulink url='&API;common/component/ClassLoaderFactory.html'><interface>ClassLoaderFactory</interface></ulink>">
 <!ENTITY StandardClassLoaderFactory		"<ulink url='&API;common/component/StandardClassLoaderFactory.html'><classname>StandardClassLoaderFactory</classname></ulink>">
 
-<!-- Types in dna-graph -->
+<!-- Types in modeshape-graph -->
 
 <!ENTITY Graph							       		"<ulink url='&API;graph/Graph.html'><classname>Graph</classname></ulink>">
 <!ENTITY GraphBatch				       			"<ulink url='&API;graph/Graph.Batch.html'><classname>Graph.Batch</classname></ulink>">
@@ -103,10 +103,10 @@
 <!ENTITY MockSequencerOutput		    	"<ulink url='&API;graph/sequencer/MockSequencerOutput.html'><interface>MockSequencerOutput</interface></ulink>">
 <!ENTITY MockSequencerContext		    	"<ulink url='&API;graph/sequencer/MockSequencerContext.html'><interface>MockSequencerContext</interface></ulink>">
 
-<!-- Types in dna-repository -->
+<!-- Types in modeshape-repository -->
 
-<!ENTITY DnaEngine					       		"<ulink url='&API;repository/DnaEngine.html'><classname>DnaEngine</classname></ulink>">
-<!ENTITY DnaConfiguration		       		"<ulink url='&API;repository/DnaConfiguration.html'><classname>DnaConfiguration</classname></ulink>">
+<!ENTITY ModeShapeEngine					       		"<ulink url='&API;repository/ModeShapeEngine.html'><classname>ModeShapeEngine</classname></ulink>">
+<!ENTITY ModeShapeConfiguration		       		"<ulink url='&API;repository/ModeShapeConfiguration.html'><classname>ModeShapeConfiguration</classname></ulink>">
 <!ENTITY RepositoryLibrary	       		"<ulink url='&API;repository/RepositoryLibrary.html'><classname>RepositoryLibrary</classname></ulink>">
 <!ENTITY RepositoryService	       		"<ulink url='&API;repository/RepositoryService.html'><classname>RepositoryService</classname></ulink>">
 <!ENTITY ServiceAdministrator   			"<ulink url='&API;repository/service/ServiceAdministrator.html'><interface>ServiceAdministrator</interface></ulink>">
@@ -120,7 +120,7 @@
 <!ENTITY MimeTypeDetectorConfig		  	"<ulink url='&API;repository/mimetype/MimeTypeDetectorConfig.html'><interface>MimeTypeDetectorConfig</interface></ulink>">
 
 
-<!-- Types in dna-jcr -->
+<!-- Types in modeshape-jcr -->
 
 <!ENTITY JcrEngine					       		"<ulink url='&API;jcr/JcrEngine.html'><classname>JcrEngine</classname></ulink>">
 <!ENTITY JcrConfiguration		       		"<ulink url='&API;jcr/JcrConfiguration.html'><classname>JcrConfiguration</classname></ulink>">
Index: docs/gettingstarted/src/main/docbook/en-US/master.xml
===================================================================
--- docs/gettingstarted/src/main/docbook/en-US/master.xml	(revision 1026)
+++ docs/gettingstarted/src/main/docbook/en-US/master.xml	Thu Jan 14 09:18:41 CET 2010
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
-  ~ JBoss DNA (http://www.jboss.org/dna)
+  ~ ModeShape (http://www.modeshape.org)
   ~
   ~ See the COPYRIGHT.txt file distributed with this work for information
   ~ regarding copyright ownership.  Some portions may be licensed
@@ -8,12 +8,12 @@
   ~ See the AUTHORS.txt file in the distribution for a full listing of 
   ~ individual contributors.
   ~
-  ~ JBoss DNA is free software. Unless otherwise indicated, all code in JBoss DNA
+  ~ ModeShape is free software. Unless otherwise indicated, all code in ModeShape
   ~ is licensed to you under the terms of the GNU Lesser General Public License as
   ~ published by the Free Software Foundation; either version 2.1 of
   ~ the License, or (at your option) any later version.
   ~
-  ~ JBoss DNA is distributed in the hope that it will be useful,
+  ~ ModeShape is distributed in the hope that it will be useful,
   ~ but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
   ~ or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License
   ~ for more details.
@@ -30,20 +30,20 @@
 ]>
 <book lang="en">
 	<bookinfo>
-		<title>JBoss DNA</title>
+		<title>ModeShape</title>
 		<subtitle>Getting Started Guide</subtitle>
 		<releaseinfo>&versionNumber;</releaseinfo>
 		<productnumber>&versionNumber;</productnumber>
 		<mediaobject>
 			<imageobject role="fo">
-				<imagedata fileref="dna-logo.png" align="center"/>
+				<imagedata fileref="modeshape-logo.png" align="center"/>
 			</imageobject>
 			<imageobject role="html">
-				<imagedata fileref="dna-logo.png" depth="3cm"/>
+				<imagedata fileref="modeshape-logo.png" depth="3cm"/>
 			</imageobject>
 		</mediaobject>
 		<copyright>
-			<year>&copyrightYear;</year>
+			<year>&copyrightYears;</year>
 			<holder>&copyrightHolder;</holder>
 		</copyright>
 		<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="content/author_group.xml"/>
@@ -51,7 +51,7 @@
 	<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="content/preface.xml"/>
 	<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="content/introduction.xml"/>
 	<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="content/use_cases.xml"/>
-	<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="content/using_dna.xml"/>
+	<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="content/using_modeshape.xml"/>
 	<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="content/downloading_and_running.xml"/>
 	<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="content/sequencer_example.xml"/>
 	<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="content/repository_example.xml"/>
Index: docs/gettingstarted/src/main/docbook/en-US/content/legal_notice.xml
===================================================================
--- docs/gettingstarted/src/main/docbook/en-US/content/legal_notice.xml	(revision 1570)
+++ docs/gettingstarted/src/main/docbook/en-US/content/legal_notice.xml	Thu Jan 14 09:01:45 CET 2010
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
-  ~ JBoss DNA (http://www.jboss.org/dna)
+  ~ ModeShape (http://www.modeshape.org)
   ~
   ~ See the COPYRIGHT.txt file distributed with this work for information
   ~ regarding copyright ownership.  Some portions may be licensed
@@ -8,12 +8,12 @@
   ~ See the AUTHORS.txt file in the distribution for a full listing of 
   ~ individual contributors.
   ~
-  ~ JBoss DNA is free software. Unless otherwise indicated, all code in JBoss DNA
+  ~ ModeShape is free software. Unless otherwise indicated, all code in ModeShape
   ~ is licensed to you under the terms of the GNU Lesser General Public License as
   ~ published by the Free Software Foundation; either version 2.1 of
   ~ the License, or (at your option) any later version.
   ~
-  ~ JBoss DNA is distributed in the hope that it will be useful,
+  ~ ModeShape is distributed in the hope that it will be useful,
   ~ but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
   ~ or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License
   ~ for more details.