Variable renames and output refactor.