Fixed sonar reported issues
Renamed jms message headers