Rename variables to avoid confusion between Core and JMS messages.
Update/improve Javadoc
Merge pull request #1147 from FranciscoBorges/master

minor documentation/code clarity changes