diff --git a/applications/stream-applications-build/pom.xml b/applications/stream-applications-build/pom.xml
index 40b2d021..adc3fe2e 100644
--- a/applications/stream-applications-build/pom.xml
+++ b/applications/stream-applications-build/pom.xml
@@ -14,8 +14,8 @@
     </parent>
 
     <modules>
-        <module>stream-apps-docs</module>
-        <module>stream-apps-descriptor</module>
+        <module>stream-applications-docs</module>
+        <module>stream-applications-descriptor</module>
     </modules>
 
     <profiles>
diff --git a/applications/stream-applications-build/stream-apps-descriptor/pom.xml b/applications/stream-applications-build/stream-applications-descriptor/pom.xml
similarity index 98%
rename from applications/stream-applications-build/stream-apps-descriptor/pom.xml
rename to applications/stream-applications-build/stream-applications-descriptor/pom.xml
index 30db0071..a211a341 100644
--- a/applications/stream-applications-build/stream-apps-descriptor/pom.xml
+++ b/applications/stream-applications-build/stream-applications-descriptor/pom.xml
@@ -7,8 +7,8 @@
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
-    <artifactId>stream-apps-descriptor</artifactId>
-    <name>stream-apps-descriptor</name>
+    <artifactId>stream-applications-descriptor</artifactId>
+    <name>stream-applications-descriptor</name>
     <packaging>jar</packaging>
 
     <properties>
diff --git a/applications/stream-applications-build/stream-apps-descriptor/src/main/resources/META-INF/kafka-apps-docker.properties b/applications/stream-applications-build/stream-applications-descriptor/src/main/resources/META-INF/kafka-apps-docker.properties
similarity index 100%
rename from applications/stream-applications-build/stream-apps-descriptor/src/main/resources/META-INF/kafka-apps-docker.properties
rename to applications/stream-applications-build/stream-applications-descriptor/src/main/resources/META-INF/kafka-apps-docker.properties
diff --git a/applications/stream-applications-build/stream-apps-descriptor/src/main/resources/META-INF/kafka-apps-maven-repo-url.properties b/applications/stream-applications-build/stream-applications-descriptor/src/main/resources/META-INF/kafka-apps-maven-repo-url.properties
similarity index 100%
rename from applications/stream-applications-build/stream-apps-descriptor/src/main/resources/META-INF/kafka-apps-maven-repo-url.properties
rename to applications/stream-applications-build/stream-applications-descriptor/src/main/resources/META-INF/kafka-apps-maven-repo-url.properties
diff --git a/applications/stream-applications-build/stream-apps-descriptor/src/main/resources/META-INF/kafka-apps-maven.properties b/applications/stream-applications-build/stream-applications-descriptor/src/main/resources/META-INF/kafka-apps-maven.properties
similarity index 100%
rename from applications/stream-applications-build/stream-apps-descriptor/src/main/resources/META-INF/kafka-apps-maven.properties
rename to applications/stream-applications-build/stream-applications-descriptor/src/main/resources/META-INF/kafka-apps-maven.properties
diff --git a/applications/stream-applications-build/stream-apps-descriptor/src/main/resources/META-INF/rabbit-apps-docker.properties b/applications/stream-applications-build/stream-applications-descriptor/src/main/resources/META-INF/rabbit-apps-docker.properties
similarity index 100%
rename from applications/stream-applications-build/stream-apps-descriptor/src/main/resources/META-INF/rabbit-apps-docker.properties
rename to applications/stream-applications-build/stream-applications-descriptor/src/main/resources/META-INF/rabbit-apps-docker.properties
diff --git a/applications/stream-applications-build/stream-apps-descriptor/src/main/resources/META-INF/rabbit-apps-maven-repo-url.properties b/applications/stream-applications-build/stream-applications-descriptor/src/main/resources/META-INF/rabbit-apps-maven-repo-url.properties
similarity index 100%
rename from applications/stream-applications-build/stream-apps-descriptor/src/main/resources/META-INF/rabbit-apps-maven-repo-url.properties
rename to applications/stream-applications-build/stream-applications-descriptor/src/main/resources/META-INF/rabbit-apps-maven-repo-url.properties
diff --git a/applications/stream-applications-build/stream-apps-descriptor/src/main/resources/META-INF/rabbit-apps-maven.properties b/applications/stream-applications-build/stream-applications-descriptor/src/main/resources/META-INF/rabbit-apps-maven.properties
similarity index 100%
rename from applications/stream-applications-build/stream-apps-descriptor/src/main/resources/META-INF/rabbit-apps-maven.properties
rename to applications/stream-applications-build/stream-applications-descriptor/src/main/resources/META-INF/rabbit-apps-maven.properties
diff --git a/applications/stream-applications-build/stream-apps-docs/README.md b/applications/stream-applications-build/stream-applications-docs/README.md
similarity index 100%
rename from applications/stream-applications-build/stream-apps-docs/README.md
rename to applications/stream-applications-build/stream-applications-docs/README.md
diff --git a/applications/stream-applications-build/stream-apps-docs/pom.xml b/applications/stream-applications-build/stream-applications-docs/pom.xml
similarity index 99%
rename from applications/stream-applications-build/stream-apps-docs/pom.xml
rename to applications/stream-applications-build/stream-applications-docs/pom.xml
index 6a25e9d7..d487eba0 100644
--- a/applications/stream-applications-build/stream-apps-docs/pom.xml
+++ b/applications/stream-applications-build/stream-applications-docs/pom.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
 	<modelVersion>4.0.0</modelVersion>
-	<artifactId>stream-apps-docs</artifactId>
-	<name>stream-apps-docs</name>
+	<artifactId>stream-applications-docs</artifactId>
+	<name>stream-applications-docs</name>
 	<description>Stream Apps Docs</description>
 	<parent>
 		<groupId>org.springframework.cloud.stream.app</groupId>
diff --git a/applications/stream-applications-build/stream-apps-docs/src/main/asciidoc/.gitignore b/applications/stream-applications-build/stream-applications-docs/src/main/asciidoc/.gitignore
similarity index 100%
rename from applications/stream-applications-build/stream-apps-docs/src/main/asciidoc/.gitignore
rename to applications/stream-applications-build/stream-applications-docs/src/main/asciidoc/.gitignore
diff --git a/applications/stream-applications-build/stream-apps-docs/src/main/asciidoc/Guardfile b/applications/stream-applications-build/stream-applications-docs/src/main/asciidoc/Guardfile
similarity index 100%
rename from applications/stream-applications-build/stream-apps-docs/src/main/asciidoc/Guardfile
rename to applications/stream-applications-build/stream-applications-docs/src/main/asciidoc/Guardfile
diff --git a/applications/stream-applications-build/stream-apps-docs/src/main/asciidoc/appendix.adoc b/applications/stream-applications-build/stream-applications-docs/src/main/asciidoc/appendix.adoc
similarity index 100%
rename from applications/stream-applications-build/stream-apps-docs/src/main/asciidoc/appendix.adoc
rename to applications/stream-applications-build/stream-applications-docs/src/main/asciidoc/appendix.adoc
diff --git a/applications/stream-applications-build/stream-apps-docs/src/main/asciidoc/contributing.adoc b/applications/stream-applications-build/stream-applications-docs/src/main/asciidoc/contributing.adoc
similarity index 100%
rename from applications/stream-applications-build/stream-apps-docs/src/main/asciidoc/contributing.adoc
rename to applications/stream-applications-build/stream-applications-docs/src/main/asciidoc/contributing.adoc
diff --git a/applications/stream-applications-build/stream-apps-docs/src/main/asciidoc/images/app-starter-naming-conventions.png b/applications/stream-applications-build/stream-applications-docs/src/main/asciidoc/images/app-starter-naming-conventions.png
similarity index 100%
rename from applications/stream-applications-build/stream-apps-docs/src/main/asciidoc/images/app-starter-naming-conventions.png
rename to applications/stream-applications-build/stream-applications-docs/src/main/asciidoc/images/app-starter-naming-conventions.png
diff --git a/applications/stream-applications-build/stream-apps-docs/src/main/asciidoc/images/logo.png b/applications/stream-applications-build/stream-applications-docs/src/main/asciidoc/images/logo.png
similarity index 100%
rename from applications/stream-applications-build/stream-apps-docs/src/main/asciidoc/images/logo.png
rename to applications/stream-applications-build/stream-applications-docs/src/main/asciidoc/images/logo.png
diff --git a/applications/stream-applications-build/stream-apps-docs/src/main/asciidoc/images/starters-pom-dependencies.png b/applications/stream-applications-build/stream-applications-docs/src/main/asciidoc/images/starters-pom-dependencies.png
similarity index 100%
rename from applications/stream-applications-build/stream-apps-docs/src/main/asciidoc/images/starters-pom-dependencies.png
rename to applications/stream-applications-build/stream-applications-docs/src/main/asciidoc/images/starters-pom-dependencies.png
diff --git a/applications/stream-applications-build/stream-apps-docs/src/main/asciidoc/index-docinfo.xml b/applications/stream-applications-build/stream-applications-docs/src/main/asciidoc/index-docinfo.xml
similarity index 100%
rename from applications/stream-applications-build/stream-apps-docs/src/main/asciidoc/index-docinfo.xml
rename to applications/stream-applications-build/stream-applications-docs/src/main/asciidoc/index-docinfo.xml
diff --git a/applications/stream-applications-build/stream-apps-docs/src/main/asciidoc/index.adoc b/applications/stream-applications-build/stream-applications-docs/src/main/asciidoc/index.adoc
similarity index 100%
rename from applications/stream-applications-build/stream-apps-docs/src/main/asciidoc/index.adoc
rename to applications/stream-applications-build/stream-applications-docs/src/main/asciidoc/index.adoc
diff --git a/applications/stream-applications-build/stream-apps-docs/src/main/asciidoc/overview.adoc b/applications/stream-applications-build/stream-applications-docs/src/main/asciidoc/overview.adoc
similarity index 100%
rename from applications/stream-applications-build/stream-apps-docs/src/main/asciidoc/overview.adoc
rename to applications/stream-applications-build/stream-applications-docs/src/main/asciidoc/overview.adoc
diff --git a/applications/stream-applications-build/stream-apps-docs/src/main/asciidoc/pom-dependencies.adoc b/applications/stream-applications-build/stream-applications-docs/src/main/asciidoc/pom-dependencies.adoc
similarity index 100%
rename from applications/stream-applications-build/stream-apps-docs/src/main/asciidoc/pom-dependencies.adoc
rename to applications/stream-applications-build/stream-applications-docs/src/main/asciidoc/pom-dependencies.adoc
diff --git a/applications/stream-applications-build/stream-apps-docs/src/main/asciidoc/processors.adoc b/applications/stream-applications-build/stream-applications-docs/src/main/asciidoc/processors.adoc
similarity index 100%
rename from applications/stream-applications-build/stream-apps-docs/src/main/asciidoc/processors.adoc
rename to applications/stream-applications-build/stream-applications-docs/src/main/asciidoc/processors.adoc
diff --git a/applications/stream-applications-build/stream-apps-docs/src/main/asciidoc/sinks.adoc b/applications/stream-applications-build/stream-applications-docs/src/main/asciidoc/sinks.adoc
similarity index 100%
rename from applications/stream-applications-build/stream-apps-docs/src/main/asciidoc/sinks.adoc
rename to applications/stream-applications-build/stream-applications-docs/src/main/asciidoc/sinks.adoc
diff --git a/applications/stream-applications-build/stream-apps-docs/src/main/asciidoc/sources.adoc b/applications/stream-applications-build/stream-applications-docs/src/main/asciidoc/sources.adoc
similarity index 100%
rename from applications/stream-applications-build/stream-apps-docs/src/main/asciidoc/sources.adoc
rename to applications/stream-applications-build/stream-applications-docs/src/main/asciidoc/sources.adoc
diff --git a/applications/stream-applications-build/stream-apps-docs/src/main/docbook/css/highlight.css b/applications/stream-applications-build/stream-applications-docs/src/main/docbook/css/highlight.css
similarity index 100%
rename from applications/stream-applications-build/stream-apps-docs/src/main/docbook/css/highlight.css
rename to applications/stream-applications-build/stream-applications-docs/src/main/docbook/css/highlight.css
diff --git a/applications/stream-applications-build/stream-apps-docs/src/main/docbook/css/manual-multipage.css b/applications/stream-applications-build/stream-applications-docs/src/main/docbook/css/manual-multipage.css
similarity index 100%
rename from applications/stream-applications-build/stream-apps-docs/src/main/docbook/css/manual-multipage.css
rename to applications/stream-applications-build/stream-applications-docs/src/main/docbook/css/manual-multipage.css
diff --git a/applications/stream-applications-build/stream-apps-docs/src/main/docbook/css/manual-singlepage.css b/applications/stream-applications-build/stream-applications-docs/src/main/docbook/css/manual-singlepage.css
similarity index 100%
rename from applications/stream-applications-build/stream-apps-docs/src/main/docbook/css/manual-singlepage.css
rename to applications/stream-applications-build/stream-applications-docs/src/main/docbook/css/manual-singlepage.css
diff --git a/applications/stream-applications-build/stream-apps-docs/src/main/docbook/css/manual.css b/applications/stream-applications-build/stream-applications-docs/src/main/docbook/css/manual.css
similarity index 100%
rename from applications/stream-applications-build/stream-apps-docs/src/main/docbook/css/manual.css
rename to applications/stream-applications-build/stream-applications-docs/src/main/docbook/css/manual.css
diff --git a/applications/stream-applications-build/stream-apps-docs/src/main/docbook/images/background.png b/applications/stream-applications-build/stream-applications-docs/src/main/docbook/images/background.png
similarity index 100%
rename from applications/stream-applications-build/stream-apps-docs/src/main/docbook/images/background.png
rename to applications/stream-applications-build/stream-applications-docs/src/main/docbook/images/background.png
diff --git a/applications/stream-applications-build/stream-apps-docs/src/main/docbook/images/callouts/1.png b/applications/stream-applications-build/stream-applications-docs/src/main/docbook/images/callouts/1.png
similarity index 100%
rename from applications/stream-applications-build/stream-apps-docs/src/main/docbook/images/callouts/1.png
rename to applications/stream-applications-build/stream-applications-docs/src/main/docbook/images/callouts/1.png
diff --git a/applications/stream-applications-build/stream-apps-docs/src/main/docbook/images/callouts/10.png b/applications/stream-applications-build/stream-applications-docs/src/main/docbook/images/callouts/10.png
similarity index 100%
rename from applications/stream-applications-build/stream-apps-docs/src/main/docbook/images/callouts/10.png
rename to applications/stream-applications-build/stream-applications-docs/src/main/docbook/images/callouts/10.png
diff --git a/applications/stream-applications-build/stream-apps-docs/src/main/docbook/images/callouts/11.png b/applications/stream-applications-build/stream-applications-docs/src/main/docbook/images/callouts/11.png
similarity index 100%
rename from applications/stream-applications-build/stream-apps-docs/src/main/docbook/images/callouts/11.png
rename to applications/stream-applications-build/stream-applications-docs/src/main/docbook/images/callouts/11.png
diff --git a/applications/stream-applications-build/stream-apps-docs/src/main/docbook/images/callouts/12.png b/applications/stream-applications-build/stream-applications-docs/src/main/docbook/images/callouts/12.png
similarity index 100%
rename from applications/stream-applications-build/stream-apps-docs/src/main/docbook/images/callouts/12.png
rename to applications/stream-applications-build/stream-applications-docs/src/main/docbook/images/callouts/12.png
diff --git a/applications/stream-applications-build/stream-apps-docs/src/main/docbook/images/callouts/13.png b/applications/stream-applications-build/stream-applications-docs/src/main/docbook/images/callouts/13.png
similarity index 100%
rename from applications/stream-applications-build/stream-apps-docs/src/main/docbook/images/callouts/13.png
rename to applications/stream-applications-build/stream-applications-docs/src/main/docbook/images/callouts/13.png
diff --git a/applications/stream-applications-build/stream-apps-docs/src/main/docbook/images/callouts/14.png b/applications/stream-applications-build/stream-applications-docs/src/main/docbook/images/callouts/14.png
similarity index 100%
rename from applications/stream-applications-build/stream-apps-docs/src/main/docbook/images/callouts/14.png
rename to applications/stream-applications-build/stream-applications-docs/src/main/docbook/images/callouts/14.png
diff --git a/applications/stream-applications-build/stream-apps-docs/src/main/docbook/images/callouts/15.png b/applications/stream-applications-build/stream-applications-docs/src/main/docbook/images/callouts/15.png
similarity index 100%
rename from applications/stream-applications-build/stream-apps-docs/src/main/docbook/images/callouts/15.png
rename to applications/stream-applications-build/stream-applications-docs/src/main/docbook/images/callouts/15.png
diff --git a/applications/stream-applications-build/stream-apps-docs/src/main/docbook/images/callouts/2.png b/applications/stream-applications-build/stream-applications-docs/src/main/docbook/images/callouts/2.png
similarity index 100%
rename from applications/stream-applications-build/stream-apps-docs/src/main/docbook/images/callouts/2.png
rename to applications/stream-applications-build/stream-applications-docs/src/main/docbook/images/callouts/2.png
diff --git a/applications/stream-applications-build/stream-apps-docs/src/main/docbook/images/callouts/3.png b/applications/stream-applications-build/stream-applications-docs/src/main/docbook/images/callouts/3.png
similarity index 100%
rename from applications/stream-applications-build/stream-apps-docs/src/main/docbook/images/callouts/3.png
rename to applications/stream-applications-build/stream-applications-docs/src/main/docbook/images/callouts/3.png
diff --git a/applications/stream-applications-build/stream-apps-docs/src/main/docbook/images/callouts/4.png b/applications/stream-applications-build/stream-applications-docs/src/main/docbook/images/callouts/4.png
similarity index 100%
rename from applications/stream-applications-build/stream-apps-docs/src/main/docbook/images/callouts/4.png
rename to applications/stream-applications-build/stream-applications-docs/src/main/docbook/images/callouts/4.png
diff --git a/applications/stream-applications-build/stream-apps-docs/src/main/docbook/images/callouts/5.png b/applications/stream-applications-build/stream-applications-docs/src/main/docbook/images/callouts/5.png
similarity index 100%
rename from applications/stream-applications-build/stream-apps-docs/src/main/docbook/images/callouts/5.png
rename to applications/stream-applications-build/stream-applications-docs/src/main/docbook/images/callouts/5.png
diff --git a/applications/stream-applications-build/stream-apps-docs/src/main/docbook/images/callouts/6.png b/applications/stream-applications-build/stream-applications-docs/src/main/docbook/images/callouts/6.png
similarity index 100%
rename from applications/stream-applications-build/stream-apps-docs/src/main/docbook/images/callouts/6.png
rename to applications/stream-applications-build/stream-applications-docs/src/main/docbook/images/callouts/6.png
diff --git a/applications/stream-applications-build/stream-apps-docs/src/main/docbook/images/callouts/7.png b/applications/stream-applications-build/stream-applications-docs/src/main/docbook/images/callouts/7.png
similarity index 100%
rename from applications/stream-applications-build/stream-apps-docs/src/main/docbook/images/callouts/7.png
rename to applications/stream-applications-build/stream-applications-docs/src/main/docbook/images/callouts/7.png
diff --git a/applications/stream-applications-build/stream-apps-docs/src/main/docbook/images/callouts/8.png b/applications/stream-applications-build/stream-applications-docs/src/main/docbook/images/callouts/8.png
similarity index 100%
rename from applications/stream-applications-build/stream-apps-docs/src/main/docbook/images/callouts/8.png
rename to applications/stream-applications-build/stream-applications-docs/src/main/docbook/images/callouts/8.png
diff --git a/applications/stream-applications-build/stream-apps-docs/src/main/docbook/images/callouts/9.png b/applications/stream-applications-build/stream-applications-docs/src/main/docbook/images/callouts/9.png
similarity index 100%
rename from applications/stream-applications-build/stream-apps-docs/src/main/docbook/images/callouts/9.png
rename to applications/stream-applications-build/stream-applications-docs/src/main/docbook/images/callouts/9.png
diff --git a/applications/stream-applications-build/stream-apps-docs/src/main/docbook/images/caution.png b/applications/stream-applications-build/stream-applications-docs/src/main/docbook/images/caution.png
similarity index 100%
rename from applications/stream-applications-build/stream-apps-docs/src/main/docbook/images/caution.png
rename to applications/stream-applications-build/stream-applications-docs/src/main/docbook/images/caution.png
diff --git a/applications/stream-applications-build/stream-apps-docs/src/main/docbook/images/cover.png b/applications/stream-applications-build/stream-applications-docs/src/main/docbook/images/cover.png
similarity index 100%
rename from applications/stream-applications-build/stream-apps-docs/src/main/docbook/images/cover.png
rename to applications/stream-applications-build/stream-applications-docs/src/main/docbook/images/cover.png
diff --git a/applications/stream-applications-build/stream-apps-docs/src/main/docbook/images/important.png b/applications/stream-applications-build/stream-applications-docs/src/main/docbook/images/important.png
similarity index 100%
rename from applications/stream-applications-build/stream-apps-docs/src/main/docbook/images/important.png
rename to applications/stream-applications-build/stream-applications-docs/src/main/docbook/images/important.png
diff --git a/applications/stream-applications-build/stream-apps-docs/src/main/docbook/images/logo.png b/applications/stream-applications-build/stream-applications-docs/src/main/docbook/images/logo.png
similarity index 100%
rename from applications/stream-applications-build/stream-apps-docs/src/main/docbook/images/logo.png
rename to applications/stream-applications-build/stream-applications-docs/src/main/docbook/images/logo.png
diff --git a/applications/stream-applications-build/stream-apps-docs/src/main/docbook/images/logo.svg b/applications/stream-applications-build/stream-applications-docs/src/main/docbook/images/logo.svg
similarity index 100%
rename from applications/stream-applications-build/stream-apps-docs/src/main/docbook/images/logo.svg
rename to applications/stream-applications-build/stream-applications-docs/src/main/docbook/images/logo.svg
diff --git a/applications/stream-applications-build/stream-apps-docs/src/main/docbook/images/note.png b/applications/stream-applications-build/stream-applications-docs/src/main/docbook/images/note.png
similarity index 100%
rename from applications/stream-applications-build/stream-apps-docs/src/main/docbook/images/note.png
rename to applications/stream-applications-build/stream-applications-docs/src/main/docbook/images/note.png
diff --git a/applications/stream-applications-build/stream-apps-docs/src/main/docbook/images/tip.png b/applications/stream-applications-build/stream-applications-docs/src/main/docbook/images/tip.png
similarity index 100%
rename from applications/stream-applications-build/stream-apps-docs/src/main/docbook/images/tip.png
rename to applications/stream-applications-build/stream-applications-docs/src/main/docbook/images/tip.png
diff --git a/applications/stream-applications-build/stream-apps-docs/src/main/docbook/images/warning.png b/applications/stream-applications-build/stream-applications-docs/src/main/docbook/images/warning.png
similarity index 100%
rename from applications/stream-applications-build/stream-apps-docs/src/main/docbook/images/warning.png
rename to applications/stream-applications-build/stream-applications-docs/src/main/docbook/images/warning.png
diff --git a/applications/stream-applications-build/stream-apps-docs/src/main/docbook/xsl/common.xsl b/applications/stream-applications-build/stream-applications-docs/src/main/docbook/xsl/common.xsl
similarity index 100%
rename from applications/stream-applications-build/stream-apps-docs/src/main/docbook/xsl/common.xsl
rename to applications/stream-applications-build/stream-applications-docs/src/main/docbook/xsl/common.xsl
diff --git a/applications/stream-applications-build/stream-apps-docs/src/main/docbook/xsl/epub.xsl b/applications/stream-applications-build/stream-applications-docs/src/main/docbook/xsl/epub.xsl
similarity index 100%
rename from applications/stream-applications-build/stream-apps-docs/src/main/docbook/xsl/epub.xsl
rename to applications/stream-applications-build/stream-applications-docs/src/main/docbook/xsl/epub.xsl
diff --git a/applications/stream-applications-build/stream-apps-docs/src/main/docbook/xsl/html-multipage.xsl b/applications/stream-applications-build/stream-applications-docs/src/main/docbook/xsl/html-multipage.xsl
similarity index 100%
rename from applications/stream-applications-build/stream-apps-docs/src/main/docbook/xsl/html-multipage.xsl
rename to applications/stream-applications-build/stream-applications-docs/src/main/docbook/xsl/html-multipage.xsl
diff --git a/applications/stream-applications-build/stream-apps-docs/src/main/docbook/xsl/html-singlepage.xsl b/applications/stream-applications-build/stream-applications-docs/src/main/docbook/xsl/html-singlepage.xsl
similarity index 100%
rename from applications/stream-applications-build/stream-apps-docs/src/main/docbook/xsl/html-singlepage.xsl
rename to applications/stream-applications-build/stream-applications-docs/src/main/docbook/xsl/html-singlepage.xsl
diff --git a/applications/stream-applications-build/stream-apps-docs/src/main/docbook/xsl/html.xsl b/applications/stream-applications-build/stream-applications-docs/src/main/docbook/xsl/html.xsl
similarity index 100%
rename from applications/stream-applications-build/stream-apps-docs/src/main/docbook/xsl/html.xsl
rename to applications/stream-applications-build/stream-applications-docs/src/main/docbook/xsl/html.xsl
diff --git a/applications/stream-applications-build/stream-apps-docs/src/main/docbook/xsl/pdf.xsl b/applications/stream-applications-build/stream-applications-docs/src/main/docbook/xsl/pdf.xsl
similarity index 100%
rename from applications/stream-applications-build/stream-apps-docs/src/main/docbook/xsl/pdf.xsl
rename to applications/stream-applications-build/stream-applications-docs/src/main/docbook/xsl/pdf.xsl
diff --git a/applications/stream-applications-build/stream-apps-docs/src/main/docbook/xsl/xslthl-config.xml b/applications/stream-applications-build/stream-applications-docs/src/main/docbook/xsl/xslthl-config.xml
similarity index 100%
rename from applications/stream-applications-build/stream-apps-docs/src/main/docbook/xsl/xslthl-config.xml
rename to applications/stream-applications-build/stream-applications-docs/src/main/docbook/xsl/xslthl-config.xml
diff --git a/applications/stream-applications-build/stream-apps-docs/src/main/docbook/xsl/xslthl/asciidoc-hl.xml b/applications/stream-applications-build/stream-applications-docs/src/main/docbook/xsl/xslthl/asciidoc-hl.xml
similarity index 100%
rename from applications/stream-applications-build/stream-apps-docs/src/main/docbook/xsl/xslthl/asciidoc-hl.xml
rename to applications/stream-applications-build/stream-applications-docs/src/main/docbook/xsl/xslthl/asciidoc-hl.xml
diff --git a/applications/stream-applications-build/stream-apps-docs/src/main/docbook/xsl/xslthl/bourne-hl.xml b/applications/stream-applications-build/stream-applications-docs/src/main/docbook/xsl/xslthl/bourne-hl.xml
similarity index 100%
rename from applications/stream-applications-build/stream-apps-docs/src/main/docbook/xsl/xslthl/bourne-hl.xml
rename to applications/stream-applications-build/stream-applications-docs/src/main/docbook/xsl/xslthl/bourne-hl.xml
diff --git a/applications/stream-applications-build/stream-apps-docs/src/main/docbook/xsl/xslthl/c-hl.xml b/applications/stream-applications-build/stream-applications-docs/src/main/docbook/xsl/xslthl/c-hl.xml
similarity index 100%
rename from applications/stream-applications-build/stream-apps-docs/src/main/docbook/xsl/xslthl/c-hl.xml
rename to applications/stream-applications-build/stream-applications-docs/src/main/docbook/xsl/xslthl/c-hl.xml
diff --git a/applications/stream-applications-build/stream-apps-docs/src/main/docbook/xsl/xslthl/cpp-hl.xml b/applications/stream-applications-build/stream-applications-docs/src/main/docbook/xsl/xslthl/cpp-hl.xml
similarity index 100%
rename from applications/stream-applications-build/stream-apps-docs/src/main/docbook/xsl/xslthl/cpp-hl.xml
rename to applications/stream-applications-build/stream-applications-docs/src/main/docbook/xsl/xslthl/cpp-hl.xml
diff --git a/applications/stream-applications-build/stream-apps-docs/src/main/docbook/xsl/xslthl/csharp-hl.xml b/applications/stream-applications-build/stream-applications-docs/src/main/docbook/xsl/xslthl/csharp-hl.xml
similarity index 100%
rename from applications/stream-applications-build/stream-apps-docs/src/main/docbook/xsl/xslthl/csharp-hl.xml
rename to applications/stream-applications-build/stream-applications-docs/src/main/docbook/xsl/xslthl/csharp-hl.xml
diff --git a/applications/stream-applications-build/stream-apps-docs/src/main/docbook/xsl/xslthl/css-hl.xml b/applications/stream-applications-build/stream-applications-docs/src/main/docbook/xsl/xslthl/css-hl.xml
similarity index 100%
rename from applications/stream-applications-build/stream-apps-docs/src/main/docbook/xsl/xslthl/css-hl.xml
rename to applications/stream-applications-build/stream-applications-docs/src/main/docbook/xsl/xslthl/css-hl.xml
diff --git a/applications/stream-applications-build/stream-apps-docs/src/main/docbook/xsl/xslthl/html-hl.xml b/applications/stream-applications-build/stream-applications-docs/src/main/docbook/xsl/xslthl/html-hl.xml
similarity index 100%
rename from applications/stream-applications-build/stream-apps-docs/src/main/docbook/xsl/xslthl/html-hl.xml
rename to applications/stream-applications-build/stream-applications-docs/src/main/docbook/xsl/xslthl/html-hl.xml
diff --git a/applications/stream-applications-build/stream-apps-docs/src/main/docbook/xsl/xslthl/ini-hl.xml b/applications/stream-applications-build/stream-applications-docs/src/main/docbook/xsl/xslthl/ini-hl.xml
similarity index 100%
rename from applications/stream-applications-build/stream-apps-docs/src/main/docbook/xsl/xslthl/ini-hl.xml
rename to applications/stream-applications-build/stream-applications-docs/src/main/docbook/xsl/xslthl/ini-hl.xml
diff --git a/applications/stream-applications-build/stream-apps-docs/src/main/docbook/xsl/xslthl/java-hl.xml b/applications/stream-applications-build/stream-applications-docs/src/main/docbook/xsl/xslthl/java-hl.xml
similarity index 100%
rename from applications/stream-applications-build/stream-apps-docs/src/main/docbook/xsl/xslthl/java-hl.xml
rename to applications/stream-applications-build/stream-applications-docs/src/main/docbook/xsl/xslthl/java-hl.xml
diff --git a/applications/stream-applications-build/stream-apps-docs/src/main/docbook/xsl/xslthl/javascript-hl.xml b/applications/stream-applications-build/stream-applications-docs/src/main/docbook/xsl/xslthl/javascript-hl.xml
similarity index 100%
rename from applications/stream-applications-build/stream-apps-docs/src/main/docbook/xsl/xslthl/javascript-hl.xml
rename to applications/stream-applications-build/stream-applications-docs/src/main/docbook/xsl/xslthl/javascript-hl.xml
diff --git a/applications/stream-applications-build/stream-apps-docs/src/main/docbook/xsl/xslthl/json-hl.xml b/applications/stream-applications-build/stream-applications-docs/src/main/docbook/xsl/xslthl/json-hl.xml
similarity index 100%
rename from applications/stream-applications-build/stream-apps-docs/src/main/docbook/xsl/xslthl/json-hl.xml
rename to applications/stream-applications-build/stream-applications-docs/src/main/docbook/xsl/xslthl/json-hl.xml
diff --git a/applications/stream-applications-build/stream-apps-docs/src/main/docbook/xsl/xslthl/perl-hl.xml b/applications/stream-applications-build/stream-applications-docs/src/main/docbook/xsl/xslthl/perl-hl.xml
similarity index 100%
rename from applications/stream-applications-build/stream-apps-docs/src/main/docbook/xsl/xslthl/perl-hl.xml
rename to applications/stream-applications-build/stream-applications-docs/src/main/docbook/xsl/xslthl/perl-hl.xml
diff --git a/applications/stream-applications-build/stream-apps-docs/src/main/docbook/xsl/xslthl/php-hl.xml b/applications/stream-applications-build/stream-applications-docs/src/main/docbook/xsl/xslthl/php-hl.xml
similarity index 100%
rename from applications/stream-applications-build/stream-apps-docs/src/main/docbook/xsl/xslthl/php-hl.xml
rename to applications/stream-applications-build/stream-applications-docs/src/main/docbook/xsl/xslthl/php-hl.xml
diff --git a/applications/stream-applications-build/stream-apps-docs/src/main/docbook/xsl/xslthl/properties-hl.xml b/applications/stream-applications-build/stream-applications-docs/src/main/docbook/xsl/xslthl/properties-hl.xml
similarity index 100%
rename from applications/stream-applications-build/stream-apps-docs/src/main/docbook/xsl/xslthl/properties-hl.xml
rename to applications/stream-applications-build/stream-applications-docs/src/main/docbook/xsl/xslthl/properties-hl.xml
diff --git a/applications/stream-applications-build/stream-apps-docs/src/main/docbook/xsl/xslthl/python-hl.xml b/applications/stream-applications-build/stream-applications-docs/src/main/docbook/xsl/xslthl/python-hl.xml
similarity index 100%
rename from applications/stream-applications-build/stream-apps-docs/src/main/docbook/xsl/xslthl/python-hl.xml
rename to applications/stream-applications-build/stream-applications-docs/src/main/docbook/xsl/xslthl/python-hl.xml
diff --git a/applications/stream-applications-build/stream-apps-docs/src/main/docbook/xsl/xslthl/ruby-hl.xml b/applications/stream-applications-build/stream-applications-docs/src/main/docbook/xsl/xslthl/ruby-hl.xml
similarity index 100%
rename from applications/stream-applications-build/stream-apps-docs/src/main/docbook/xsl/xslthl/ruby-hl.xml
rename to applications/stream-applications-build/stream-applications-docs/src/main/docbook/xsl/xslthl/ruby-hl.xml
diff --git a/applications/stream-applications-build/stream-apps-docs/src/main/docbook/xsl/xslthl/sql2003-hl.xml b/applications/stream-applications-build/stream-applications-docs/src/main/docbook/xsl/xslthl/sql2003-hl.xml
similarity index 100%
rename from applications/stream-applications-build/stream-apps-docs/src/main/docbook/xsl/xslthl/sql2003-hl.xml
rename to applications/stream-applications-build/stream-applications-docs/src/main/docbook/xsl/xslthl/sql2003-hl.xml
diff --git a/applications/stream-applications-build/stream-apps-docs/src/main/docbook/xsl/xslthl/yaml-hl.xml b/applications/stream-applications-build/stream-applications-docs/src/main/docbook/xsl/xslthl/yaml-hl.xml
similarity index 100%
rename from applications/stream-applications-build/stream-apps-docs/src/main/docbook/xsl/xslthl/yaml-hl.xml
rename to applications/stream-applications-build/stream-applications-docs/src/main/docbook/xsl/xslthl/yaml-hl.xml
diff --git a/applications/stream-applications-build/stream-apps-docs/src/main/javadoc/spring-javadoc.css b/applications/stream-applications-build/stream-applications-docs/src/main/javadoc/spring-javadoc.css
similarity index 100%
rename from applications/stream-applications-build/stream-apps-docs/src/main/javadoc/spring-javadoc.css
rename to applications/stream-applications-build/stream-applications-docs/src/main/javadoc/spring-javadoc.css