Better variable names
Better variable names


Former-commit-id: 6118aeedd2c7619375f7577ff0bc4944e90a37b2 [formerly ac3cbb6e733f6fce859ca05d2fdc573e8d12a070]
Former-commit-id: 90fb7aaf4f7f1aca4aae68016755af5445a4b830
gem/oq-engine,gem/oq-engine,gem/oq-engine,gem/oq-engine,gem/oq-engine