Rename operation variables correctly