diff --git a/technologies/apache/default-apache-install-all-versions.yaml b/technologies/apache/default-apache-test-all.yaml
similarity index 100%
rename from technologies/apache/default-apache-install-all-versions.yaml
rename to technologies/apache/default-apache-test-all.yaml
diff --git a/workflows/detect-default-web-application-installation-workflow.yaml b/workflows/default-application-workflow.yaml
similarity index 62%
rename from workflows/detect-default-web-application-installation-workflow.yaml
rename to workflows/default-application-workflow.yaml
index 262eaf0c12..0c9c1de16c 100644
--- a/workflows/detect-default-web-application-installation-workflow.yaml
+++ b/workflows/default-application-workflow.yaml
@@ -1,29 +1,22 @@
-id: detect-default-web-application-installation-workflow
+id: default-application-workflow
 
 info:
   name: Default Web Application Detection
   author: andydoering
   description: Detects default installations of web applications
-  severity: info
-  tags: tech,default,apache,xampp,iis,azure,asp,nginx,lighttpd,django,oracle,ibm
-
-requests:
-  - method: GET
-    path:
-      - "{{BaseURL}}"
 
 workflows:
-  - template: technologies/apache/default-apache-install-all-versions.yaml
+  - template: technologies/apache/default-apache-test-all.yaml
   - template: technologies/apache/xampp-default-page.yaml
   - template: technologies/microsoft/default-iis7-page.yaml
   - template: technologies/microsoft/default-windows-server-page.yaml
   - template: technologies/microsoft/default-microsoft-azure-page.yaml
-  - template: technologies/default-asp.net-page.yaml
+  - template: technologies/default-asp-net-page.yaml
   - template: technologies/nginx/default-nginx-page.yaml
   - template: technologies/lighttpd-default.yaml
   - template: technologies/default-django-page.yaml
   - template: exposures/files/drupal-install.yaml
   - template: technologies/oracle/default-oracle-application-page.yaml
-  - template: technologies/ibm-http-server.yaml
+  - template: technologies/ibm/ibm-http-server.yaml
   - template: technologies/lighttpd-default.yaml
-  - template: technologies/default-detect-generic.yaml
+  - template: technologies/default-detect-generic.yaml
\ No newline at end of file