Update variable naming.