Changed variables names in calculator to match drews variables.