Rename some variables in CircularSample