improvement: use same naming convention for all options