fixed some renaming issues in Calipers