Rename properties files.
Remove unused properties.
Simplify AMQ client name.