Fix variable name for simpler naming convention