Merge branch 'alfroch-consistent-naming' into 'master'

Adding consistent n_jets naming

See merge request !570
51 jobs for !570 with alfroch-consistent-naming into master in 15 minutes and 31 seconds (queued for 5 seconds)