diff --git a/exposures/files/axis-happyaxis-disclosure.yaml b/exposures/files/axis-happyaxis.yaml
similarity index 74%
rename from exposures/files/axis-happyaxis-disclosure.yaml
rename to exposures/files/axis-happyaxis.yaml
index 583eac2cef..193c3d184f 100644
--- a/exposures/files/axis-happyaxis-disclosure.yaml
+++ b/exposures/files/axis-happyaxis.yaml
@@ -1,10 +1,10 @@
-id: axis-happyaxis-disclosure
+id: axis-happyaxis
 
 info:
-  name: axis-happyaxis-disclosure
+  name: Axis Happyaxis Exposure
   author: dogasantos
   severity: info
-  tags: axis,axis2,middleware
+  tags: axis,axis2,middleware,exposure,apache
 
 requests:
   - method: GET
@@ -13,15 +13,18 @@ requests:
       - "{{BaseURL}}/axis/happyaxis.jsp"
       - "{{BaseURL}}/axis2-web/HappyAxis.jsp"
       - "{{BaseURL}}/happyaxis.jsp"
+
     matchers-condition: and
     matchers:
       - type: word
         words:
           - "Axis Happiness Page"
           - "Axis2 Happiness Page"
-          - "java.vendor"
           - "Examining Application Server"
+          - "Examining Version Service"
+          - "Examining System Properties"
         condition: or
+
       - type: status
         status:
           - 200
diff --git a/technologies/apache-axis-detect.yaml b/technologies/apache-axis-detect.yaml
index 03a5506ec6..2c9733d95c 100644
--- a/technologies/apache-axis-detect.yaml
+++ b/technologies/apache-axis-detect.yaml
@@ -5,14 +5,15 @@ info:
   author: dogasantos
   severity: info
   description: Axis and Axis2 detection
-  tags: axis2,middleware
+  tags: tech,axis2,middleware,apache
 
 requests:
   - method: GET
     path:
+      - "{{BaseURL}}"
       - "{{BaseURL}}/axis2/"
       - "{{BaseURL}}/axis/"
-      - "{{BaseURL}}/"
+
     matchers-condition: and
     matchers:
       - type: word
@@ -24,6 +25,7 @@ requests:
           - "installation"
           - "Admin"
         condition: and
+
       - type: status
         status:
           - 200