Renames variables per #3499 comments