Update variable naming