Updated another section of variables to match current master. (This time type.)