Small rename of variables that was causing confusion.