Changed variable names to match new back-end names