Merge "modify control loop name"