diff --git a/bitrepository-alarm-service/src/main/java/org/bitrepository/alarm/alarmservice/WebAlarm.java b/bitrepository-alarm-service/src/main/java/org/bitrepository/alarm/alarmservice/WebAlarm.java
index b4f96469f..c97a87087 100644
--- a/bitrepository-alarm-service/src/main/java/org/bitrepository/alarm/alarmservice/WebAlarm.java
+++ b/bitrepository-alarm-service/src/main/java/org/bitrepository/alarm/alarmservice/WebAlarm.java
@@ -51,7 +51,7 @@ public WebAlarm(Alarm alarm) {
         
     }
 
-    @XmlElement(name = "OrigDateTime")
+    @XmlElement(name = "origDateTime")
     public String getOrigDateTime() {
         return origDateTime;
     }
@@ -60,7 +60,7 @@ public void setOrigDateTime(String origDateTime) {
         this.origDateTime = origDateTime;
     }
     
-    @XmlElement(name = "AlarmCode")
+    @XmlElement(name = "alarmCode")
     public AlarmCode getAlarmCode() {
         return alarmCode;
     }
@@ -69,7 +69,7 @@ public void setAlarmCode(AlarmCode alarmCode) {
         this.alarmCode = alarmCode;
     }
     
-    @XmlElement(name = "AlarmRaiser")
+    @XmlElement(name = "alarmRaiser")
     public String getAlarmRaiser() {
         return alarmRaiser;
     }
@@ -78,7 +78,7 @@ public void setAlarmRaiser(String alarmRaiser) {
         this.alarmRaiser = alarmRaiser;
     }
     
-    @XmlElement(name = "AlarmText")
+    @XmlElement(name = "alarmText")
     public String getAlarmText() {
         return alarmText;
     }
@@ -87,7 +87,7 @@ public void setAlarmText(String alarmText) {
         this.alarmText = alarmText;
     }    
     
-    @XmlElement(name = "CollectionID")
+    @XmlElement(name = "collectionID")
     public String getCollectionID() {
         return collectionID;
     }
diff --git a/bitrepository-webclient/src/main/webapp/alarm-service.html b/bitrepository-webclient/src/main/webapp/alarm-service.html
index 1df05e707..fb4728a5f 100644
--- a/bitrepository-webclient/src/main/webapp/alarm-service.html
+++ b/bitrepository-webclient/src/main/webapp/alarm-service.html
@@ -153,11 +153,11 @@
          var htmlTableBody = "";
          if(j != null) {
            for (var i = 0; i < j.length; i++) {
-            htmlTableBody += "<tr><td>" + j[i].OrigDateTime + 
-                             "</td><td>" + j[i].AlarmRaiser +
-                             "</td><td>" + nameMapper.getName(j[i].CollectionID) +
-                             "</td> <td>" + j[i].AlarmCode + 
-                             "</td> <td>" + nl2br(j[i].AlarmText) +
+            htmlTableBody += "<tr><td>" + j[i].origDateTime +
+                             "</td><td>" + j[i].alarmRaiser +
+                             "</td><td>" + nameMapper.getName(j[i].collectionID) +
+                             "</td> <td>" + j[i].alarmCode +
+                             "</td> <td>" + nl2br(j[i].alarmText) +
                              "</td></tr>";
           }
         }