diff --git a/asterix-doc/pom.xml b/asterix-doc/pom.xml
index 039110a..0e93ea1 100644
--- a/asterix-doc/pom.xml
+++ b/asterix-doc/pom.xml
@@ -57,7 +57,7 @@
 								<resource>
 									<directory>../asterix-examples/target/</directory>
 									<includes>
-										<include>adm101-demo.zip</include>
+										<include>admaql101-demo.zip</include>
 										<include>tweetbook-demo.zip</include>
 									</includes>
 								</resource>
diff --git a/asterix-doc/src/site/markdown/aql/js-sdk.md b/asterix-doc/src/site/markdown/aql/js-sdk.md
index 5423454..2283c11 100644
--- a/asterix-doc/src/site/markdown/aql/js-sdk.md
+++ b/asterix-doc/src/site/markdown/aql/js-sdk.md
@@ -8,8 +8,14 @@
 	<script src="path/to/asterix-sdk-stable.js"></script>
 
 ## Interactive Demos
-- Cherry demo
-- All of the examples in following section can be viewed by running the interactive demo.
+There are two interactive demos that are available for download. Both of the
+demos illustrate how the javascript API would be used in an application:
+
+* [Tweetbook Demo](../download/tweetbook-demo.zip): a contrived geo-spatial
+  application dealing with artificial Tweets allowing spatial, temporal, and
+  keyword-based filtering.
+* [ADM/AQL 101 Demo](../download/admaql101-demo.zip): an interactive version of
+  all of the examples that are provided in the following section.
 
 ## The javascript SDK: by example ##
 In this section, we explore how to form AQL queries using the javascript SDK. The queries from
diff --git a/asterix-examples/pom.xml b/asterix-examples/pom.xml
index 86d1978..9f3376e 100644
--- a/asterix-examples/pom.xml
+++ b/asterix-examples/pom.xml
@@ -24,11 +24,11 @@
 				<version>2.2-beta-5</version>
 				<executions>
 					<execution>
-						<id>adm101-demo-binary-assembly</id>
+						<id>admaql101-demo-binary-assembly</id>
 						<configuration>
 							<appendAssemblyId>false</appendAssemblyId>
-							<finalName>adm101-demo</finalName>
-							<descriptor>src/main/assembly/adm101-demo-binary-assembly.xml</descriptor>
+							<finalName>admaql101-demo</finalName>
+							<descriptor>src/main/assembly/admaql101-demo-binary-assembly.xml</descriptor>
 						</configuration>
 						<phase>package</phase>
 						<goals>
diff --git a/asterix-examples/src/main/assembly/adm101-demo-binary-assembly.xml b/asterix-examples/src/main/assembly/admaql101-demo-binary-assembly.xml
similarity index 89%
rename from asterix-examples/src/main/assembly/adm101-demo-binary-assembly.xml
rename to asterix-examples/src/main/assembly/admaql101-demo-binary-assembly.xml
index f9921a7..cd72f3b 100644
--- a/asterix-examples/src/main/assembly/adm101-demo-binary-assembly.xml
+++ b/asterix-examples/src/main/assembly/admaql101-demo-binary-assembly.xml
@@ -13,14 +13,14 @@
  ! limitations under the License.
  !-->
 <assembly>
-	<id>adm101-demo-binary-assembly</id>
+	<id>admaql101-demo-binary-assembly</id>
 	<formats>
 		<format>zip</format>
 	</formats>
 	<includeBaseDirectory>false</includeBaseDirectory>
 	<fileSets>
 		<fileSet>
-			<directory>src/main/resources/adm101-demo</directory>
+			<directory>src/main/resources/admaql101-demo</directory>
 			<fileMode>0755</fileMode>
 		</fileSet>
 	</fileSets>
diff --git a/asterix-examples/src/main/resources/adm101-demo/README.md b/asterix-examples/src/main/resources/admaql101-demo/README.md
similarity index 100%
rename from asterix-examples/src/main/resources/adm101-demo/README.md
rename to asterix-examples/src/main/resources/admaql101-demo/README.md
diff --git a/asterix-examples/src/main/resources/adm101-demo/admaql101.py b/asterix-examples/src/main/resources/admaql101-demo/admaql101.py
similarity index 100%
rename from asterix-examples/src/main/resources/adm101-demo/admaql101.py
rename to asterix-examples/src/main/resources/admaql101-demo/admaql101.py
diff --git a/asterix-examples/src/main/resources/adm101-demo/bottle.py b/asterix-examples/src/main/resources/admaql101-demo/bottle.py
similarity index 100%
rename from asterix-examples/src/main/resources/adm101-demo/bottle.py
rename to asterix-examples/src/main/resources/admaql101-demo/bottle.py
diff --git a/asterix-examples/src/main/resources/adm101-demo/demo.tpl b/asterix-examples/src/main/resources/admaql101-demo/demo.tpl
similarity index 100%
rename from asterix-examples/src/main/resources/adm101-demo/demo.tpl
rename to asterix-examples/src/main/resources/admaql101-demo/demo.tpl
diff --git a/asterix-examples/src/main/resources/adm101-demo/run_101_demo.py b/asterix-examples/src/main/resources/admaql101-demo/run_101_demo.py
similarity index 100%
rename from asterix-examples/src/main/resources/adm101-demo/run_101_demo.py
rename to asterix-examples/src/main/resources/admaql101-demo/run_101_demo.py
diff --git a/asterix-examples/src/main/resources/adm101-demo/static/css/bootstrap.min.css b/asterix-examples/src/main/resources/admaql101-demo/static/css/bootstrap.min.css
similarity index 100%
rename from asterix-examples/src/main/resources/adm101-demo/static/css/bootstrap.min.css
rename to asterix-examples/src/main/resources/admaql101-demo/static/css/bootstrap.min.css
diff --git a/asterix-examples/src/main/resources/adm101-demo/static/js/asterix-sdk-stable.js b/asterix-examples/src/main/resources/admaql101-demo/static/js/asterix-sdk-stable.js
similarity index 100%
rename from asterix-examples/src/main/resources/adm101-demo/static/js/asterix-sdk-stable.js
rename to asterix-examples/src/main/resources/admaql101-demo/static/js/asterix-sdk-stable.js
diff --git a/asterix-examples/src/main/resources/adm101-demo/static/js/bootstrap.min.js b/asterix-examples/src/main/resources/admaql101-demo/static/js/bootstrap.min.js
similarity index 100%
rename from asterix-examples/src/main/resources/adm101-demo/static/js/bootstrap.min.js
rename to asterix-examples/src/main/resources/admaql101-demo/static/js/bootstrap.min.js
diff --git a/asterix-examples/src/main/resources/adm101-demo/static/js/demo.js b/asterix-examples/src/main/resources/admaql101-demo/static/js/demo.js
similarity index 100%
rename from asterix-examples/src/main/resources/adm101-demo/static/js/demo.js
rename to asterix-examples/src/main/resources/admaql101-demo/static/js/demo.js
diff --git a/asterix-examples/src/main/resources/adm101-demo/static/js/jquery.min.js b/asterix-examples/src/main/resources/admaql101-demo/static/js/jquery.min.js
similarity index 100%
rename from asterix-examples/src/main/resources/adm101-demo/static/js/jquery.min.js
rename to asterix-examples/src/main/resources/admaql101-demo/static/js/jquery.min.js
diff --git a/asterix-examples/src/main/resources/adm101-demo/tinysocial/fbm.adm b/asterix-examples/src/main/resources/admaql101-demo/tinysocial/fbm.adm
similarity index 100%
rename from asterix-examples/src/main/resources/adm101-demo/tinysocial/fbm.adm
rename to asterix-examples/src/main/resources/admaql101-demo/tinysocial/fbm.adm
diff --git a/asterix-examples/src/main/resources/adm101-demo/tinysocial/fbu.adm b/asterix-examples/src/main/resources/admaql101-demo/tinysocial/fbu.adm
similarity index 100%
rename from asterix-examples/src/main/resources/adm101-demo/tinysocial/fbu.adm
rename to asterix-examples/src/main/resources/admaql101-demo/tinysocial/fbu.adm
diff --git a/asterix-examples/src/main/resources/adm101-demo/tinysocial/query.txt b/asterix-examples/src/main/resources/admaql101-demo/tinysocial/query.txt
similarity index 100%
rename from asterix-examples/src/main/resources/adm101-demo/tinysocial/query.txt
rename to asterix-examples/src/main/resources/admaql101-demo/tinysocial/query.txt
diff --git a/asterix-examples/src/main/resources/adm101-demo/tinysocial/twm.adm b/asterix-examples/src/main/resources/admaql101-demo/tinysocial/twm.adm
similarity index 100%
rename from asterix-examples/src/main/resources/adm101-demo/tinysocial/twm.adm
rename to asterix-examples/src/main/resources/admaql101-demo/tinysocial/twm.adm
diff --git a/asterix-examples/src/main/resources/adm101-demo/tinysocial/twu.adm b/asterix-examples/src/main/resources/admaql101-demo/tinysocial/twu.adm
similarity index 100%
rename from asterix-examples/src/main/resources/adm101-demo/tinysocial/twu.adm
rename to asterix-examples/src/main/resources/admaql101-demo/tinysocial/twu.adm