Updated variable names to be more clear their purpose
Upgraded to Camel version 2.12.1 (again)