Adjust to idiomatic variable names.