Merge branch 'lukas_issue206_refac_inconsistent-variable-naming' into 'develop'

Resolve "handle inconsistent naming in data source"

See merge request toar/mlair!185