diff --git a/.gitignore b/.gitignore
index 39e1f9943f..3a0afb1a0e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -48,3 +48,7 @@ catalog.xml
 #########
 target
 
+# ccutil build directory #
+##########################
+build/
+
diff --git a/SUMMARY.adoc b/SUMMARY.adoc
index f228c8d62e..6afa750d7b 100644
--- a/SUMMARY.adoc
+++ b/SUMMARY.adoc
@@ -25,11 +25,11 @@
       ... link:topics/oidc/java/jetty8-adapter.adoc[Jetty 8.1.x Adapter]
       ... link:topics/oidc/java/spring-boot-adapter.adoc[Spring Boot Adapter]
       ... link:topics/oidc/java/spring-security-adapter.adoc[Spring Security Adapter]
-      {% endif %}  
+      {% endif %}
       {% if book.community %}
       ... link:topics/oidc/java/servlet-filter-adapter.adoc[Java Servlet Filter Adapter]
       ... link:topics/oidc/java/jaas.adoc[JAAS plugin]
-      {% endif %}  
+      {% endif %}
       ... link:topics/oidc/java/adapter-context.adoc[Security Context]
       ... link:topics/oidc/java/adapter_error_handling.adoc[Error Handling]
       ... link:topics/oidc/java/logout.adoc[Logout]
@@ -61,7 +61,7 @@
  .... link:topics/saml/java/general-config/idp_singlelogoutservice_subelement.adoc[IDP SingleLogoutService sub element]
  .... link:topics/saml/java/general-config/idp_keys_subelement.adoc[IDP Keys subelement]
  .... link:topics/saml/java/general-config/idp_httpclient_subelement.adoc[IDP HttpClient subelement]
- ... link:topics/saml/java/jboss-adapter.adoc[JBoss EAP/Wildfly Adapter]
+ ... link:topics/saml/java/saml-jboss-adapter.adoc[JBoss EAP/Wildfly Adapter]
  .... link:topics/saml/java/jboss-adapter/jboss_adapter_installation.adoc[Adapter Installation]
  .... link:topics/saml/java/jboss-adapter/required_per_war_configuration.adoc[Per WAR Configuration]
  .... link:topics/saml/java/jboss-adapter/securing_wars.adoc[Securing WARs via SAML Subsystem]
@@ -77,7 +77,7 @@
  {% endif %}
  {% if book.community %}
  ... link:topics/saml/java/servlet-filter-adapter.adoc[Java Servlet Filter Adapter]
- {% endif %}  
+ {% endif %}
  ... link:topics/saml/java/idp-registration.adoc[Registering with an IDP]
  ... link:topics/saml/java/logout.adoc[Logout]
  ... link:topics/saml/java/assertion-api.adoc[Obtaining Assertion Attributes]
diff --git a/topics/overview/supported-platforms.adoc b/topics/overview/supported-platforms.adoc
index f12642e675..e8585c1463 100644
--- a/topics/overview/supported-platforms.adoc
+++ b/topics/overview/supported-platforms.adoc
@@ -67,9 +67,9 @@
 
 ===== Java
 
-* <<fake/../../saml/java/jboss-adapter.adoc#_jboss_adapter,JBoss EAP>>
+* <<fake/../../saml/java/saml-jboss-adapter.adoc#_saml_jboss_adapter,JBoss EAP>>
 {% if book.community %}
-* <<fake/../../saml/java/jboss-adapter.adoc#_jboss_adapter,WildFly>>
+* <<fake/../../saml/java/saml-jboss-adapter.adoc#_saml_jboss_adapter,WildFly>>
 * <<fake/../../saml/java/tomcat-adapter.adoc#_tomcat_adapter,Tomcat>>
 * <<fake/../../saml/java/jetty-adapter.adoc#_jetty_saml_adapter,Jetty>>
 {% endif %}
diff --git a/topics/saml/java/jboss-adapter.adoc b/topics/saml/java/saml-jboss-adapter.adoc
similarity index 96%
rename from topics/saml/java/jboss-adapter.adoc
rename to topics/saml/java/saml-jboss-adapter.adoc
index 7ca4f173aa..c090aba125 100644
--- a/topics/saml/java/jboss-adapter.adoc
+++ b/topics/saml/java/saml-jboss-adapter.adoc
@@ -1,4 +1,4 @@
-[[_saml-jboss-adapter]]
+[[_saml_jboss_adapter]]
 
 {% if book.community %}
 ==== JBoss EAP/Wildfly Adapter