Change names of some measurement varibles.

The previous names created some confusion for me with common notation
for radii.