Use same naming conventions as calculator