Merge branch 'nomenclature' into 'ducc0'

better variable names

See merge request !37
4 jobs for ducc0 in 17 minutes and 34 seconds (queued for 2 seconds)